From 862bb474f929de73a78f5ac595163b08e6fefad0 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:29:02 -0300 Subject: [PATCH 001/237] creating webchat service --- ecis | 25 ++++++++++--- webchat/app.js | 10 ++++++ webchat/config.js | 10 ++++++ webchat/favicon.ico | Bin 0 -> 32038 bytes webchat/firebase-config.js | 10 ++++++ webchat/index.html | 71 +++++++++++++++++++++++++++++++++++++ webchat/webchat.yaml | 17 +++++++++ 7 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 webchat/app.js create mode 100644 webchat/config.js create mode 100644 webchat/favicon.ico create mode 100644 webchat/firebase-config.js create mode 100644 webchat/index.html create mode 100644 webchat/webchat.yaml diff --git a/ecis b/ecis index 093ef874e..c7f42fbbe 100755 --- a/ecis +++ b/ecis @@ -14,18 +14,21 @@ FRONTEND_YAML=frontend/frontend.yaml BACKEND_YAML=backend/backend.yaml WORKER_YAML=backend/worker.yaml SUPPORT_YAML=support/support.yaml +WEBCHAT_YAML=webchat/webchat.yaml LANDINGPAGE_LOCAL="localhost:8080" FRONTEND_LOCAL="localhost:8081" BACKEND_LOCAL="localhost:8082" SUPPORT_LOCAL="localhost:8083" +WEBCHAT_LOCAL="localhost:8084" FRONTEND_CONFIG_FILE="frontend/config.js" SUPPORT_CONFIG_FILE="support/config.js" LANDINGPAGE_CONFIG_FILE="landing/config.js" +WEBCHAT_CONFIG_FILE="webchat/config.js" SW_FILE="frontend/sw.js" -git update-index --skip-worktree $FRONTEND_CONFIG_FILE $SUPPORT_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE +git update-index --skip-worktree $FRONTEND_CONFIG_FILE $SUPPORT_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $WEBCHAT_CONFIG_FILE PY_ENV=backend/py_env @@ -77,6 +80,7 @@ function set_config_file { sed -i "$line s|.*| $service: '$url',|" $FRONTEND_CONFIG_FILE sed -i "$line s|.*| $service: '$url',|" $SUPPORT_CONFIG_FILE sed -i "$line s|.*| $service: '$url',|" $LANDINGPAGE_CONFIG_FILE + sed -i "$line s|.*| $service: '$url',|" $WEBCHAT_CONFIG_FILE catch_error $? "Frontend will use ${bold}$url${_bold} as $service_name." catch_error $? "Support will use ${bold}$url${_bold} as $service_name." @@ -114,12 +118,22 @@ function set_frontend_url { set_config_file $line $service $url $service_name; } +function set_webchat_url { + url=$(set_service_url $1 $2); + service="WEBCHAT_URL"; + line=8; + service_name="webchat"; + set_config_file $line $service $url $service_name; +} + function set_app_version_config { - sed -i "8s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE catch_error $? "APP VERSION on Frontend $1" - sed -i "8s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE catch_error $? "APP VERSION on Support $1" - sed -i "8s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE + catch_error $? "APP VERSION on LandingPage $1" + sed -i "9s|.*| APP_VERSION: '$1'|" $WEBCHAT_CONFIG_FILE catch_error $? "APP VERSION on LandingPage $1" } @@ -212,6 +226,7 @@ case "$1" in set_landingpage_url local $LANDINGPAGE_LOCAL set_support_url local $SUPPORT_LOCAL set_frontend_url local $FRONTEND_LOCAL + set_webchat_url local $WEBCHAT_LOCAL if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then gcloud beta emulators datastore start --host-port=0.0.0.0:8586 & @@ -223,7 +238,7 @@ case "$1" in fi $(gcloud beta emulators datastore env-init) - dev_appserver.py $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $WORKER_YAML -A development-cis --support_datastore_emulator=$emulator $other_parameter + dev_appserver.py $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $WEBCHAT_YAML $WORKER_YAML -A development-cis --support_datastore_emulator=$emulator $other_parameter $(gcloud beta emulators datastore env-unset) ;; diff --git a/webchat/app.js b/webchat/app.js new file mode 100644 index 000000000..49c192c08 --- /dev/null +++ b/webchat/app.js @@ -0,0 +1,10 @@ +'use strict'; + +(function() { + var app = angular.module('app', [ + ]); + + (function main() { + console.log("app running"); + })(); +})(); \ No newline at end of file diff --git a/webchat/config.js b/webchat/config.js new file mode 100644 index 000000000..1b378227d --- /dev/null +++ b/webchat/config.js @@ -0,0 +1,10 @@ +"use strict"; + +var Config = { + BACKEND_URL: 'http://localhost:8082', + LANDINGPAGE_URL: 'http://localhost:8080', + SUPPORT_URL: 'http://localhost:8083', + FRONTEND_URL: 'http://localhost:8081', + WEBCHAT_URL: 'http://localhost:8084', + APP_VERSION: 'dev' +} diff --git a/webchat/favicon.ico b/webchat/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1d395073d639a42d5ed78f8ce87e6ca95d6386fe GIT binary patch literal 32038 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 M1Ni3te-{V-ABs94^8f$< literal 0 HcmV?d00001 diff --git a/webchat/firebase-config.js b/webchat/firebase-config.js new file mode 100644 index 000000000..519c127a7 --- /dev/null +++ b/webchat/firebase-config.js @@ -0,0 +1,10 @@ +var FIREBASE_CONFIG = { + apiKey: "AIzaSyBlpZudOyqMsSDIkZcPMmLCBxY5DWkoz14", + authDomain: "development-cis.firebaseapp.com", + databaseURL: "https://development-cis.firebaseio.com", + projectId: "development-cis", + storageBucket: "development-cis.appspot.com", + messagingSenderId: "531467954503" +}; + +var KEY_PAIR = "BBT_s9UZ_4AOO_0AbheNE1XpDHOK0EJphftaSP2an4zTkh1C8xRVKEpTFC7s5Z8eg9MBKZhGx96i3mS5a67oDeI"; diff --git a/webchat/index.html b/webchat/index.html new file mode 100644 index 000000000..2f7047472 --- /dev/null +++ b/webchat/index.html @@ -0,0 +1,71 @@ + + + + + + + + Plataforma CIS + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webchat/webchat.yaml b/webchat/webchat.yaml new file mode 100644 index 000000000..4a52fb0bd --- /dev/null +++ b/webchat/webchat.yaml @@ -0,0 +1,17 @@ +runtime: python27 +api_version: 1 +threadsafe: yes +service: webchat + +default_expiration: "1s" + +handlers: +- url: /app/(.*) + secure: always + static_files: \1 + upload: (.*) + +- url: /(.*) + secure: always + static_files: index.html + upload: index.html \ No newline at end of file From b3c97f3c20c33c4c97c49ca6f53c240e34b83220 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:39:30 -0300 Subject: [PATCH 002/237] adding config in gitgnore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b4239cd22..0916a008e 100644 --- a/.gitignore +++ b/.gitignore @@ -526,6 +526,7 @@ paket-files/ frontend/config.js support/config.js landing/config.js +webchat/config.js frontend/firebase-config.js support/firebase-config.js From 6936c3b0b168a130f20c6b8006cdfa13519101f0 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:42:19 -0300 Subject: [PATCH 003/237] config.js webchat modified --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0916a008e..2807a1bae 100644 --- a/.gitignore +++ b/.gitignore @@ -526,7 +526,7 @@ paket-files/ frontend/config.js support/config.js landing/config.js -webchat/config.js +# webchat/config.js frontend/firebase-config.js support/firebase-config.js From 2e112ba3cffc612f86089f72ed524a4384ab46cf Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:44:32 -0300 Subject: [PATCH 004/237] Modifieds configs js --- .gitignore | 6 +++--- frontend/config.js | 5 +++-- landing/config.js | 5 +++-- support/config.js | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2807a1bae..917ac7210 100644 --- a/.gitignore +++ b/.gitignore @@ -523,9 +523,9 @@ paket-files/ # End of https://www.gitignore.io/api/vim,git,bower,grunt,python,intellij,appengine,sublimetext,visualstudio -frontend/config.js -support/config.js -landing/config.js +# frontend/config.js +# support/config.js +# landing/config.js # webchat/config.js frontend/firebase-config.js diff --git a/frontend/config.js b/frontend/config.js index 4161bf225..48ea6dec0 100644 --- a/frontend/config.js +++ b/frontend/config.js @@ -5,5 +5,6 @@ var Config = { LANDINGPAGE_URL: 'http://localhost:8080', SUPPORT_URL: 'http://localhost:8083', FRONTEND_URL: 'http://localhost:8081', - APP_VERSION: 'master' -}; + WEBCHAT_URL: 'http://localhost:8084', + APP_VERSION: 'webchat' +} diff --git a/landing/config.js b/landing/config.js index 4161bf225..e39039e35 100644 --- a/landing/config.js +++ b/landing/config.js @@ -5,5 +5,6 @@ var Config = { LANDINGPAGE_URL: 'http://localhost:8080', SUPPORT_URL: 'http://localhost:8083', FRONTEND_URL: 'http://localhost:8081', - APP_VERSION: 'master' -}; + WEBCHAT_URL: 'http://localhost:8084', + APP_VERSION: 'webchat' +} \ No newline at end of file diff --git a/support/config.js b/support/config.js index 4161bf225..48ea6dec0 100644 --- a/support/config.js +++ b/support/config.js @@ -5,5 +5,6 @@ var Config = { LANDINGPAGE_URL: 'http://localhost:8080', SUPPORT_URL: 'http://localhost:8083', FRONTEND_URL: 'http://localhost:8081', - APP_VERSION: 'master' -}; + WEBCHAT_URL: 'http://localhost:8084', + APP_VERSION: 'webchat' +} From 44c968522078856d2ff2915820a3ae0d09c9790b Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:46:07 -0300 Subject: [PATCH 005/237] added config.js in gitgnore --- .gitignore | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 917ac7210..c13020da8 100644 --- a/.gitignore +++ b/.gitignore @@ -523,13 +523,14 @@ paket-files/ # End of https://www.gitignore.io/api/vim,git,bower,grunt,python,intellij,appengine,sublimetext,visualstudio -# frontend/config.js -# support/config.js -# landing/config.js -# webchat/config.js +frontend/config.js +support/config.js +landing/config.js +webchat/config.js frontend/firebase-config.js support/firebase-config.js +webchat/firebase-config.js backend/firebase_config.py backend/app_version.py From cf5842c79f188ee828465ecdb4aae621737f3c65 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 29 Nov 2018 10:47:53 -0300 Subject: [PATCH 006/237] config --- .gitignore | 2 +- webchat/config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c13020da8..125b787c7 100644 --- a/.gitignore +++ b/.gitignore @@ -526,7 +526,7 @@ paket-files/ frontend/config.js support/config.js landing/config.js -webchat/config.js +# webchat/config.js frontend/firebase-config.js support/firebase-config.js diff --git a/webchat/config.js b/webchat/config.js index 1b378227d..48ea6dec0 100644 --- a/webchat/config.js +++ b/webchat/config.js @@ -6,5 +6,5 @@ var Config = { SUPPORT_URL: 'http://localhost:8083', FRONTEND_URL: 'http://localhost:8081', WEBCHAT_URL: 'http://localhost:8084', - APP_VERSION: 'dev' + APP_VERSION: 'webchat' } From 9448d22739c30e5c98c751737a5128931c76568a Mon Sep 17 00:00:00 2001 From: Julie Pessoa Date: Thu, 29 Nov 2018 11:27:43 -0300 Subject: [PATCH 007/237] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 125b787c7..c13020da8 100644 --- a/.gitignore +++ b/.gitignore @@ -526,7 +526,7 @@ paket-files/ frontend/config.js support/config.js landing/config.js -# webchat/config.js +webchat/config.js frontend/firebase-config.js support/firebase-config.js From 118866ae40337249ed9fd80420663d8405c05ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 30 Nov 2018 22:24:35 -0300 Subject: [PATCH 008/237] Add empty login.html --- webchat/auth/login.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 webchat/auth/login.html diff --git a/webchat/auth/login.html b/webchat/auth/login.html new file mode 100644 index 000000000..e69de29bb From 1b35f652eaf773b2f27b0f9ae4fb7e008a076dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 30 Nov 2018 23:09:03 -0300 Subject: [PATCH 009/237] Add ui-router support --- frontend/sw.js | 2 +- webchat/app.js | 50 + webchat/chat/chat.html | 0 webchat/home/home.html | 0 webchat/index.html | 4 + webchat/libs/angular-ui-router.js | 10075 ++++++++++++++++++++++++++++ webchat/video/video.html | 0 webchat/webchat/webchat.html | 0 8 files changed, 10130 insertions(+), 1 deletion(-) create mode 100644 webchat/chat/chat.html create mode 100644 webchat/home/home.html create mode 100644 webchat/libs/angular-ui-router.js create mode 100644 webchat/video/video.html create mode 100644 webchat/webchat/webchat.html diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..b8bb9a801 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'webchat'; let messaging; diff --git a/webchat/app.js b/webchat/app.js index 49c192c08..0e4d330c8 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -2,8 +2,58 @@ (function() { var app = angular.module('app', [ + 'ui.router', ]); + app.config(function($stateProvider) { + $stateProvider + .state("webchat", { + abstract: true, + views: { + main: { + templateUrl: "app/webchat/webchat.html", + controller: "WebchatController as controller", + }, + }, + }) + .state("webchat.home", { + url: "/", + views: { + content: { + templateUrl: "app/home/home.html", + controller: "HomeController as controller", + }, + }, + }) + .state("webchat.chat", { + url: "/chat", + views: { + content: { + templateUrl: "app/chat/chat.html", + controller: "ChatController as controller", + }, + }, + }) + .state("webchat.video", { + url: "/video", + views: { + content: { + templateUrl: "app/video/video.html", + controller: "VideoController as controller", + }, + }, + }) + .state("login", { + url: "/login", + views: { + main: { + templateUrl: "app/auth/login.html", + controller: "LoginController as controller", + }, + }, + }) + }); + (function main() { console.log("app running"); })(); diff --git a/webchat/chat/chat.html b/webchat/chat/chat.html new file mode 100644 index 000000000..e69de29bb diff --git a/webchat/home/home.html b/webchat/home/home.html new file mode 100644 index 000000000..e69de29bb diff --git a/webchat/index.html b/webchat/index.html index 2f7047472..d8ab61237 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -63,9 +63,13 @@ firebase.initializeApp(firebaseConfig); + + + + diff --git a/webchat/libs/angular-ui-router.js b/webchat/libs/angular-ui-router.js new file mode 100644 index 000000000..4e69b5e20 --- /dev/null +++ b/webchat/libs/angular-ui-router.js @@ -0,0 +1,10075 @@ +/** + * State-based routing for AngularJS 1.x + * NOTICE: This monolithic bundle also bundles the @uirouter/core code. + * This causes it to be incompatible with plugins that depend on @uirouter/core. + * We recommend switching to the ui-router-core.js and ui-router-angularjs.js bundles instead. + * For more information, see https://ui-router.github.io/blog/uirouter-for-angularjs-umd-bundles + * @version v1.0.10 + * @link https://ui-router.github.io + * @license MIT License, http://www.opensource.org/licenses/MIT + */ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('angular')) : + typeof define === 'function' && define.amd ? define(['exports', 'angular'], factory) : + (factory((global['@uirouter/angularjs'] = {}),global.angular)); +}(this, (function (exports,ng_from_import) { 'use strict'; + +var ng_from_global = angular; +var ng = (ng_from_import && ng_from_import.module) ? ng_from_import : ng_from_global; + +/** + * Higher order functions + * + * These utility functions are exported, but are subject to change without notice. + * + * @module common_hof + */ /** */ +/** + * Returns a new function for [Partial Application](https://en.wikipedia.org/wiki/Partial_application) of the original function. + * + * Given a function with N parameters, returns a new function that supports partial application. + * The new function accepts anywhere from 1 to N parameters. When that function is called with M parameters, + * where M is less than N, it returns a new function that accepts the remaining parameters. It continues to + * accept more parameters until all N parameters have been supplied. + * + * + * This contrived example uses a partially applied function as an predicate, which returns true + * if an object is found in both arrays. + * @example + * ``` + * // returns true if an object is in both of the two arrays + * function inBoth(array1, array2, object) { + * return array1.indexOf(object) !== -1 && + * array2.indexOf(object) !== 1; + * } + * let obj1, obj2, obj3, obj4, obj5, obj6, obj7 + * let foos = [obj1, obj3] + * let bars = [obj3, obj4, obj5] + * + * // A curried "copy" of inBoth + * let curriedInBoth = curry(inBoth); + * // Partially apply both the array1 and array2 + * let inFoosAndBars = curriedInBoth(foos, bars); + * + * // Supply the final argument; since all arguments are + * // supplied, the original inBoth function is then called. + * let obj1InBoth = inFoosAndBars(obj1); // false + * + * // Use the inFoosAndBars as a predicate. + * // Filter, on each iteration, supplies the final argument + * let allObjs = [ obj1, obj2, obj3, obj4, obj5, obj6, obj7 ]; + * let foundInBoth = allObjs.filter(inFoosAndBars); // [ obj3 ] + * + * ``` + * + * Stolen from: http://stackoverflow.com/questions/4394747/javascript-curry-function + * + * @param fn + * @returns {*|function(): (*|any)} + */ +function curry(fn) { + var initial_args = [].slice.apply(arguments, [1]); + var func_args_length = fn.length; + function curried(args) { + if (args.length >= func_args_length) + return fn.apply(null, args); + return function () { + return curried(args.concat([].slice.apply(arguments))); + }; + } + return curried(initial_args); +} +/** + * Given a varargs list of functions, returns a function that composes the argument functions, right-to-left + * given: f(x), g(x), h(x) + * let composed = compose(f,g,h) + * then, composed is: f(g(h(x))) + */ +function compose() { + var args = arguments; + var start = args.length - 1; + return function () { + var i = start, result = args[start].apply(this, arguments); + while (i--) + result = args[i].call(this, result); + return result; + }; +} +/** + * Given a varargs list of functions, returns a function that is composes the argument functions, left-to-right + * given: f(x), g(x), h(x) + * let piped = pipe(f,g,h); + * then, piped is: h(g(f(x))) + */ +function pipe() { + var funcs = []; + for (var _i = 0; _i < arguments.length; _i++) { + funcs[_i] = arguments[_i]; + } + return compose.apply(null, [].slice.call(arguments).reverse()); +} +/** + * Given a property name, returns a function that returns that property from an object + * let obj = { foo: 1, name: "blarg" }; + * let getName = prop("name"); + * getName(obj) === "blarg" + */ +var prop = function (name) { + return function (obj) { return obj && obj[name]; }; +}; +/** + * Given a property name and a value, returns a function that returns a boolean based on whether + * the passed object has a property that matches the value + * let obj = { foo: 1, name: "blarg" }; + * let getName = propEq("name", "blarg"); + * getName(obj) === true + */ +var propEq = curry(function (name, val, obj) { return obj && obj[name] === val; }); +/** + * Given a dotted property name, returns a function that returns a nested property from an object, or undefined + * let obj = { id: 1, nestedObj: { foo: 1, name: "blarg" }, }; + * let getName = prop("nestedObj.name"); + * getName(obj) === "blarg" + * let propNotFound = prop("this.property.doesnt.exist"); + * propNotFound(obj) === undefined + */ +var parse = function (name) { + return pipe.apply(null, name.split(".").map(prop)); +}; +/** + * Given a function that returns a truthy or falsey value, returns a + * function that returns the opposite (falsey or truthy) value given the same inputs + */ +var not = function (fn) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return !fn.apply(null, args); + }; +}; +/** + * Given two functions that return truthy or falsey values, returns a function that returns truthy + * if both functions return truthy for the given arguments + */ +function and(fn1, fn2) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return fn1.apply(null, args) && fn2.apply(null, args); + }; +} +/** + * Given two functions that return truthy or falsey values, returns a function that returns truthy + * if at least one of the functions returns truthy for the given arguments + */ +function or(fn1, fn2) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return fn1.apply(null, args) || fn2.apply(null, args); + }; +} +/** + * Check if all the elements of an array match a predicate function + * + * @param fn1 a predicate function `fn1` + * @returns a function which takes an array and returns true if `fn1` is true for all elements of the array + */ +var all = function (fn1) { + return function (arr) { return arr.reduce(function (b, x) { return b && !!fn1(x); }, true); }; +}; +var any = function (fn1) { + return function (arr) { return arr.reduce(function (b, x) { return b || !!fn1(x); }, false); }; +}; +/** Given a class, returns a Predicate function that returns true if the object is of that class */ +var is = function (ctor) { + return function (obj) { + return (obj != null && obj.constructor === ctor || obj instanceof ctor); + }; +}; +/** Given a value, returns a Predicate function that returns true if another value is === equal to the original value */ +var eq = function (val) { return function (other) { + return val === other; +}; }; +/** Given a value, returns a function which returns the value */ +var val = function (v) { return function () { return v; }; }; +function invoke(fnName, args) { + return function (obj) { + return obj[fnName].apply(obj, args); + }; +} +/** + * Sorta like Pattern Matching (a functional programming conditional construct) + * + * See http://c2.com/cgi/wiki?PatternMatching + * + * This is a conditional construct which allows a series of predicates and output functions + * to be checked and then applied. Each predicate receives the input. If the predicate + * returns truthy, then its matching output function (mapping function) is provided with + * the input and, then the result is returned. + * + * Each combination (2-tuple) of predicate + output function should be placed in an array + * of size 2: [ predicate, mapFn ] + * + * These 2-tuples should be put in an outer array. + * + * @example + * ``` + * + * // Here's a 2-tuple where the first element is the isString predicate + * // and the second element is a function that returns a description of the input + * let firstTuple = [ angular.isString, (input) => `Heres your string ${input}` ]; + * + * // Second tuple: predicate "isNumber", mapfn returns a description + * let secondTuple = [ angular.isNumber, (input) => `(${input}) That's a number!` ]; + * + * let third = [ (input) => input === null, (input) => `Oh, null...` ]; + * + * let fourth = [ (input) => input === undefined, (input) => `notdefined` ]; + * + * let descriptionOf = pattern([ firstTuple, secondTuple, third, fourth ]); + * + * console.log(descriptionOf(undefined)); // 'notdefined' + * console.log(descriptionOf(55)); // '(55) That's a number!' + * console.log(descriptionOf("foo")); // 'Here's your string foo' + * ``` + * + * @param struct A 2D array. Each element of the array should be an array, a 2-tuple, + * with a Predicate and a mapping/output function + * @returns {function(any): *} + */ +function pattern(struct) { + return function (x) { + for (var i = 0; i < struct.length; i++) { + if (struct[i][0](x)) + return struct[i][1](x); + } + }; +} + +/** + * @coreapi + * @module core + */ +/** + * Matches state names using glob-like pattern strings. + * + * Globs can be used in specific APIs including: + * + * - [[StateService.is]] + * - [[StateService.includes]] + * - The first argument to Hook Registration functions like [[TransitionService.onStart]] + * - [[HookMatchCriteria]] and [[HookMatchCriterion]] + * + * A `Glob` string is a pattern which matches state names. + * Nested state names are split into segments (separated by a dot) when processing. + * The state named `foo.bar.baz` is split into three segments ['foo', 'bar', 'baz'] + * + * Globs work according to the following rules: + * + * ### Exact match: + * + * The glob `'A.B'` matches the state named exactly `'A.B'`. + * + * | Glob |Matches states named|Does not match state named| + * |:------------|:--------------------|:---------------------| + * | `'A'` | `'A'` | `'B'` , `'A.C'` | + * | `'A.B'` | `'A.B'` | `'A'` , `'A.B.C'` | + * | `'foo'` | `'foo'` | `'FOO'` , `'foo.bar'`| + * + * ### Single star (`*`) + * + * A single star (`*`) is a wildcard that matches exactly one segment. + * + * | Glob |Matches states named |Does not match state named | + * |:------------|:---------------------|:--------------------------| + * | `'*'` | `'A'` , `'Z'` | `'A.B'` , `'Z.Y.X'` | + * | `'A.*'` | `'A.B'` , `'A.C'` | `'A'` , `'A.B.C'` | + * | `'A.*.*'` | `'A.B.C'` , `'A.X.Y'`| `'A'`, `'A.B'` , `'Z.Y.X'`| + * + * ### Double star (`**`) + * + * A double star (`'**'`) is a wildcard that matches *zero or more segments* + * + * | Glob |Matches states named |Does not match state named | + * |:------------|:----------------------------------------------|:----------------------------------| + * | `'**'` | `'A'` , `'A.B'`, `'Z.Y.X'` | (matches all states) | + * | `'A.**'` | `'A'` , `'A.B'` , `'A.C.X'` | `'Z.Y.X'` | + * | `'**.X'` | `'X'` , `'A.X'` , `'Z.Y.X'` | `'A'` , `'A.login.Z'` | + * | `'A.**.X'` | `'A.X'` , `'A.B.X'` , `'A.B.C.X'` | `'A'` , `'A.B.C'` | + * + */ +var Glob = /** @class */ (function () { + function Glob(text) { + this.text = text; + this.glob = text.split('.'); + var regexpString = this.text.split('.') + .map(function (seg) { + if (seg === '**') + return '(?:|(?:\\.[^.]*)*)'; + if (seg === '*') + return '\\.[^.]*'; + return '\\.' + seg; + }).join(''); + this.regexp = new RegExp("^" + regexpString + "$"); + } + Glob.prototype.matches = function (name) { + return this.regexp.test('.' + name); + }; + /** Returns true if the string has glob-like characters in it */ + Glob.is = function (text) { + return !!/[!,*]+/.exec(text); + }; + /** Returns a glob from the string, or null if the string isn't Glob-like */ + Glob.fromString = function (text) { + return Glob.is(text) ? new Glob(text) : null; + }; + return Glob; +}()); + +/** + * Internal representation of a UI-Router state. + * + * Instances of this class are created when a [[StateDeclaration]] is registered with the [[StateRegistry]]. + * + * A registered [[StateDeclaration]] is augmented with a getter ([[StateDeclaration.$$state]]) which returns the corresponding [[StateObject]] object. + * + * This class prototypally inherits from the corresponding [[StateDeclaration]]. + * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]]. + */ +var StateObject = /** @class */ (function () { + /** @deprecated use State.create() */ + function StateObject(config) { + return StateObject.create(config || {}); + } + /** + * Create a state object to put the private/internal implementation details onto. + * The object's prototype chain looks like: + * (Internal State Object) -> (Copy of State.prototype) -> (State Declaration object) -> (State Declaration's prototype...) + * + * @param stateDecl the user-supplied State Declaration + * @returns {StateObject} an internal State object + */ + StateObject.create = function (stateDecl) { + stateDecl = StateObject.isStateClass(stateDecl) ? new stateDecl() : stateDecl; + var state = inherit(inherit(stateDecl, StateObject.prototype)); + stateDecl.$$state = function () { return state; }; + state.self = stateDecl; + state.__stateObjectCache = { + nameGlob: Glob.fromString(state.name) // might return null + }; + return state; + }; + /** + * Returns true if the provided parameter is the same state. + * + * Compares the identity of the state against the passed value, which is either an object + * reference to the actual `State` instance, the original definition object passed to + * `$stateProvider.state()`, or the fully-qualified name. + * + * @param ref Can be one of (a) a `State` instance, (b) an object that was passed + * into `$stateProvider.state()`, (c) the fully-qualified name of a state as a string. + * @returns Returns `true` if `ref` matches the current `State` instance. + */ + StateObject.prototype.is = function (ref) { + return this === ref || this.self === ref || this.fqn() === ref; + }; + /** + * @deprecated this does not properly handle dot notation + * @returns Returns a dot-separated name of the state. + */ + StateObject.prototype.fqn = function () { + if (!this.parent || !(this.parent instanceof this.constructor)) + return this.name; + var name = this.parent.fqn(); + return name ? name + "." + this.name : this.name; + }; + /** + * Returns the root node of this state's tree. + * + * @returns The root of this state's tree. + */ + StateObject.prototype.root = function () { + return this.parent && this.parent.root() || this; + }; + /** + * Gets the state's `Param` objects + * + * Gets the list of [[Param]] objects owned by the state. + * If `opts.inherit` is true, it also includes the ancestor states' [[Param]] objects. + * If `opts.matchingKeys` exists, returns only `Param`s whose `id` is a key on the `matchingKeys` object + * + * @param opts options + */ + StateObject.prototype.parameters = function (opts) { + opts = defaults(opts, { inherit: true, matchingKeys: null }); + var inherited = opts.inherit && this.parent && this.parent.parameters() || []; + return inherited.concat(values(this.params)) + .filter(function (param) { return !opts.matchingKeys || opts.matchingKeys.hasOwnProperty(param.id); }); + }; + /** + * Returns a single [[Param]] that is owned by the state + * + * If `opts.inherit` is true, it also searches the ancestor states` [[Param]]s. + * @param id the name of the [[Param]] to return + * @param opts options + */ + StateObject.prototype.parameter = function (id, opts) { + if (opts === void 0) { opts = {}; } + return (this.url && this.url.parameter(id, opts) || + find(values(this.params), propEq('id', id)) || + opts.inherit && this.parent && this.parent.parameter(id)); + }; + StateObject.prototype.toString = function () { + return this.fqn(); + }; + /** Predicate which returns true if the object is an class with @State() decorator */ + StateObject.isStateClass = function (stateDecl) { + return isFunction(stateDecl) && stateDecl['__uiRouterState'] === true; + }; + /** Predicate which returns true if the object is an internal [[StateObject]] object */ + StateObject.isState = function (obj) { + return isObject(obj['__stateObjectCache']); + }; + return StateObject; +}()); + +/** Predicates + * + * These predicates return true/false based on the input. + * Although these functions are exported, they are subject to change without notice. + * + * @module common_predicates + */ +/** */ +var toStr = Object.prototype.toString; +var tis = function (t) { return function (x) { return typeof (x) === t; }; }; +var isUndefined = tis('undefined'); +var isDefined = not(isUndefined); +var isNull = function (o) { return o === null; }; +var isNullOrUndefined = or(isNull, isUndefined); +var isFunction = tis('function'); +var isNumber = tis('number'); +var isString = tis('string'); +var isObject = function (x) { return x !== null && typeof x === 'object'; }; +var isArray = Array.isArray; +var isDate = (function (x) { return toStr.call(x) === '[object Date]'; }); +var isRegExp = (function (x) { return toStr.call(x) === '[object RegExp]'; }); +var isState = StateObject.isState; +/** + * Predicate which checks if a value is injectable + * + * A value is "injectable" if it is a function, or if it is an ng1 array-notation-style array + * where all the elements in the array are Strings, except the last one, which is a Function + */ +function isInjectable(val$$1) { + if (isArray(val$$1) && val$$1.length) { + var head = val$$1.slice(0, -1), tail = val$$1.slice(-1); + return !(head.filter(not(isString)).length || tail.filter(not(isFunction)).length); + } + return isFunction(val$$1); +} +/** + * Predicate which checks if a value looks like a Promise + * + * It is probably a Promise if it's an object, and it has a `then` property which is a Function + */ +var isPromise = and(isObject, pipe(prop('then'), isFunction)); + +var notImplemented = function (fnname) { return function () { + throw new Error(fnname + "(): No coreservices implementation for UI-Router is loaded."); +}; }; +var services = { + $q: undefined, + $injector: undefined, +}; + +/** + * Random utility functions used in the UI-Router code + * + * These functions are exported, but are subject to change without notice. + * + * @preferred + * @module common + */ +/** for typedoc */ +var root = (typeof self === 'object' && self.self === self && self) || + (typeof global === 'object' && global.global === global && global) || undefined; +var angular$1 = root.angular || {}; +var fromJson = angular$1.fromJson || JSON.parse.bind(JSON); +var toJson = angular$1.toJson || JSON.stringify.bind(JSON); +var forEach = angular$1.forEach || _forEach; +var extend = Object.assign || _extend; +var equals = angular$1.equals || _equals; +function identity(x) { return x; } +function noop$1() { } +/** + * Builds proxy functions on the `to` object which pass through to the `from` object. + * + * For each key in `fnNames`, creates a proxy function on the `to` object. + * The proxy function calls the real function on the `from` object. + * + * + * #### Example: + * This example creates an new class instance whose functions are prebound to the new'd object. + * ```js + * class Foo { + * constructor(data) { + * // Binds all functions from Foo.prototype to 'this', + * // then copies them to 'this' + * bindFunctions(Foo.prototype, this, this); + * this.data = data; + * } + * + * log() { + * console.log(this.data); + * } + * } + * + * let myFoo = new Foo([1,2,3]); + * var logit = myFoo.log; + * logit(); // logs [1, 2, 3] from the myFoo 'this' instance + * ``` + * + * #### Example: + * This example creates a bound version of a service function, and copies it to another object + * ``` + * + * var SomeService = { + * this.data = [3, 4, 5]; + * this.log = function() { + * console.log(this.data); + * } + * } + * + * // Constructor fn + * function OtherThing() { + * // Binds all functions from SomeService to SomeService, + * // then copies them to 'this' + * bindFunctions(SomeService, this, SomeService); + * } + * + * let myOtherThing = new OtherThing(); + * myOtherThing.log(); // logs [3, 4, 5] from SomeService's 'this' + * ``` + * + * @param source A function that returns the source object which contains the original functions to be bound + * @param target A function that returns the target object which will receive the bound functions + * @param bind A function that returns the object which the functions will be bound to + * @param fnNames The function names which will be bound (Defaults to all the functions found on the 'from' object) + * @param latebind If true, the binding of the function is delayed until the first time it's invoked + */ +function createProxyFunctions(source, target, bind, fnNames, latebind) { + if (latebind === void 0) { latebind = false; } + var bindFunction = function (fnName) { + return source()[fnName].bind(bind()); + }; + var makeLateRebindFn = function (fnName) { return function lateRebindFunction() { + target[fnName] = bindFunction(fnName); + return target[fnName].apply(null, arguments); + }; }; + fnNames = fnNames || Object.keys(source()); + return fnNames.reduce(function (acc, name) { + acc[name] = latebind ? makeLateRebindFn(name) : bindFunction(name); + return acc; + }, target); +} +/** + * prototypal inheritance helper. + * Creates a new object which has `parent` object as its prototype, and then copies the properties from `extra` onto it + */ +var inherit = function (parent, extra) { + return extend(Object.create(parent), extra); +}; +/** Given an array, returns true if the object is found in the array, (using indexOf) */ +var inArray = curry(_inArray); +function _inArray(array, obj) { + return array.indexOf(obj) !== -1; +} +/** + * Given an array, and an item, if the item is found in the array, it removes it (in-place). + * The same array is returned + */ +var removeFrom = curry(_removeFrom); +function _removeFrom(array, obj) { + var idx = array.indexOf(obj); + if (idx >= 0) + array.splice(idx, 1); + return array; +} +/** pushes a values to an array and returns the value */ +var pushTo = curry(_pushTo); +function _pushTo(arr, val$$1) { + return (arr.push(val$$1), val$$1); +} +/** Given an array of (deregistration) functions, calls all functions and removes each one from the source array */ +var deregAll = function (functions) { + return functions.slice().forEach(function (fn) { + typeof fn === 'function' && fn(); + removeFrom(functions, fn); + }); +}; +/** + * Applies a set of defaults to an options object. The options object is filtered + * to only those properties of the objects in the defaultsList. + * Earlier objects in the defaultsList take precedence when applying defaults. + */ +function defaults(opts) { + var defaultsList = []; + for (var _i = 1; _i < arguments.length; _i++) { + defaultsList[_i - 1] = arguments[_i]; + } + var _defaultsList = defaultsList.concat({}).reverse(); + var defaultVals = extend.apply(null, _defaultsList); + return extend({}, defaultVals, pick(opts || {}, Object.keys(defaultVals))); +} +/** Reduce function that merges each element of the list into a single object, using extend */ +var mergeR = function (memo, item) { return extend(memo, item); }; +/** + * Finds the common ancestor path between two states. + * + * @param {Object} first The first state. + * @param {Object} second The second state. + * @return {Array} Returns an array of state names in descending order, not including the root. + */ +function ancestors(first, second) { + var path = []; + for (var n in first.path) { + if (first.path[n] !== second.path[n]) + break; + path.push(first.path[n]); + } + return path; +} +/** + * Return a copy of the object only containing the whitelisted properties. + * + * #### Example: + * ``` + * var foo = { a: 1, b: 2, c: 3 }; + * var ab = pick(foo, ['a', 'b']); // { a: 1, b: 2 } + * ``` + * @param obj the source object + * @param propNames an Array of strings, which are the whitelisted property names + */ +function pick(obj, propNames) { + var objCopy = {}; + for (var prop_1 in obj) { + if (propNames.indexOf(prop_1) !== -1) { + objCopy[prop_1] = obj[prop_1]; + } + } + return objCopy; +} +/** + * Return a copy of the object omitting the blacklisted properties. + * + * @example + * ``` + * + * var foo = { a: 1, b: 2, c: 3 }; + * var ab = omit(foo, ['a', 'b']); // { c: 3 } + * ``` + * @param obj the source object + * @param propNames an Array of strings, which are the blacklisted property names + */ +function omit(obj, propNames) { + return Object.keys(obj) + .filter(not(inArray(propNames))) + .reduce(function (acc, key) { return (acc[key] = obj[key], acc); }, {}); +} +/** + * Maps an array, or object to a property (by name) + */ +function pluck(collection, propName) { + return map(collection, prop(propName)); +} +/** Filters an Array or an Object's properties based on a predicate */ +function filter(collection, callback) { + var arr = isArray(collection), result = arr ? [] : {}; + var accept = arr ? function (x) { return result.push(x); } : function (x, key) { return result[key] = x; }; + forEach(collection, function (item, i) { + if (callback(item, i)) + accept(item, i); + }); + return result; +} +/** Finds an object from an array, or a property of an object, that matches a predicate */ +function find(collection, callback) { + var result; + forEach(collection, function (item, i) { + if (result) + return; + if (callback(item, i)) + result = item; + }); + return result; +} +/** Given an object, returns a new object, where each property is transformed by the callback function */ +var mapObj = map; +/** Maps an array or object properties using a callback function */ +function map(collection, callback) { + var result = isArray(collection) ? [] : {}; + forEach(collection, function (item, i) { return result[i] = callback(item, i); }); + return result; +} +/** + * Given an object, return its enumerable property values + * + * @example + * ``` + * + * let foo = { a: 1, b: 2, c: 3 } + * let vals = values(foo); // [ 1, 2, 3 ] + * ``` + */ +var values = function (obj) { + return Object.keys(obj).map(function (key) { return obj[key]; }); +}; +/** + * Reduce function that returns true if all of the values are truthy. + * + * @example + * ``` + * + * let vals = [ 1, true, {}, "hello world"]; + * vals.reduce(allTrueR, true); // true + * + * vals.push(0); + * vals.reduce(allTrueR, true); // false + * ``` + */ +var allTrueR = function (memo, elem) { return memo && elem; }; +/** + * Reduce function that returns true if any of the values are truthy. + * + * * @example + * ``` + * + * let vals = [ 0, null, undefined ]; + * vals.reduce(anyTrueR, true); // false + * + * vals.push("hello world"); + * vals.reduce(anyTrueR, true); // true + * ``` + */ +var anyTrueR = function (memo, elem) { return memo || elem; }; +/** + * Reduce function which un-nests a single level of arrays + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * input.reduce(unnestR, []) // [ "a", "b", "c", "d", [ "double, "nested" ] ] + * ``` + */ +var unnestR = function (memo, elem) { return memo.concat(elem); }; +/** + * Reduce function which recursively un-nests all arrays + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * input.reduce(unnestR, []) // [ "a", "b", "c", "d", "double, "nested" ] + * ``` + */ +var flattenR = function (memo, elem) { + return isArray(elem) ? memo.concat(elem.reduce(flattenR, [])) : pushR(memo, elem); +}; +/** + * Reduce function that pushes an object to an array, then returns the array. + * Mostly just for [[flattenR]] and [[uniqR]] + */ +function pushR(arr, obj) { + arr.push(obj); + return arr; +} +/** Reduce function that filters out duplicates */ +var uniqR = function (acc, token) { + return inArray(acc, token) ? acc : pushR(acc, token); +}; +/** + * Return a new array with a single level of arrays unnested. + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * unnest(input) // [ "a", "b", "c", "d", [ "double, "nested" ] ] + * ``` + */ +var unnest = function (arr) { return arr.reduce(unnestR, []); }; +/** + * Return a completely flattened version of an array. + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * flatten(input) // [ "a", "b", "c", "d", "double, "nested" ] + * ``` + */ +var flatten = function (arr) { return arr.reduce(flattenR, []); }; +/** + * Given a .filter Predicate, builds a .filter Predicate which throws an error if any elements do not pass. + * @example + * ``` + * + * let isNumber = (obj) => typeof(obj) === 'number'; + * let allNumbers = [ 1, 2, 3, 4, 5 ]; + * allNumbers.filter(assertPredicate(isNumber)); //OK + * + * let oneString = [ 1, 2, 3, 4, "5" ]; + * oneString.filter(assertPredicate(isNumber, "Not all numbers")); // throws Error(""Not all numbers""); + * ``` + */ +var assertPredicate = assertFn; +/** + * Given a .map function, builds a .map function which throws an error if any mapped elements do not pass a truthyness test. + * @example + * ``` + * + * var data = { foo: 1, bar: 2 }; + * + * let keys = [ 'foo', 'bar' ] + * let values = keys.map(assertMap(key => data[key], "Key not found")); + * // values is [1, 2] + * + * let keys = [ 'foo', 'bar', 'baz' ] + * let values = keys.map(assertMap(key => data[key], "Key not found")); + * // throws Error("Key not found") + * ``` + */ +var assertMap = assertFn; +function assertFn(predicateOrMap, errMsg) { + if (errMsg === void 0) { errMsg = "assert failure"; } + return function (obj) { + var result = predicateOrMap(obj); + if (!result) { + throw new Error(isFunction(errMsg) ? errMsg(obj) : errMsg); + } + return result; + }; +} +/** + * Like _.pairs: Given an object, returns an array of key/value pairs + * + * @example + * ``` + * + * pairs({ foo: "FOO", bar: "BAR }) // [ [ "foo", "FOO" ], [ "bar": "BAR" ] ] + * ``` + */ +var pairs = function (obj) { + return Object.keys(obj).map(function (key) { return [key, obj[key]]; }); +}; +/** + * Given two or more parallel arrays, returns an array of tuples where + * each tuple is composed of [ a[i], b[i], ... z[i] ] + * + * @example + * ``` + * + * let foo = [ 0, 2, 4, 6 ]; + * let bar = [ 1, 3, 5, 7 ]; + * let baz = [ 10, 30, 50, 70 ]; + * arrayTuples(foo, bar); // [ [0, 1], [2, 3], [4, 5], [6, 7] ] + * arrayTuples(foo, bar, baz); // [ [0, 1, 10], [2, 3, 30], [4, 5, 50], [6, 7, 70] ] + * ``` + */ +function arrayTuples() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + if (args.length === 0) + return []; + var maxArrayLen = args.reduce(function (min, arr) { return Math.min(arr.length, min); }, 9007199254740991); // aka 2^53 − 1 aka Number.MAX_SAFE_INTEGER + var i, result = []; + for (i = 0; i < maxArrayLen; i++) { + // This is a hot function + // Unroll when there are 1-4 arguments + switch (args.length) { + case 1: + result.push([args[0][i]]); + break; + case 2: + result.push([args[0][i], args[1][i]]); + break; + case 3: + result.push([args[0][i], args[1][i], args[2][i]]); + break; + case 4: + result.push([args[0][i], args[1][i], args[2][i], args[3][i]]); + break; + default: + result.push(args.map(function (array) { return array[i]; })); + break; + } + } + return result; +} +/** + * Reduce function which builds an object from an array of [key, value] pairs. + * + * Each iteration sets the key/val pair on the memo object, then returns the memo for the next iteration. + * + * Each keyValueTuple should be an array with values [ key: string, value: any ] + * + * @example + * ``` + * + * var pairs = [ ["fookey", "fooval"], ["barkey", "barval"] ] + * + * var pairsToObj = pairs.reduce((memo, pair) => applyPairs(memo, pair), {}) + * // pairsToObj == { fookey: "fooval", barkey: "barval" } + * + * // Or, more simply: + * var pairsToObj = pairs.reduce(applyPairs, {}) + * // pairsToObj == { fookey: "fooval", barkey: "barval" } + * ``` + */ +function applyPairs(memo, keyValTuple) { + var key, value; + if (isArray(keyValTuple)) + key = keyValTuple[0], value = keyValTuple[1]; + if (!isString(key)) + throw new Error("invalid parameters to applyPairs"); + memo[key] = value; + return memo; +} +/** Get the last element of an array */ +function tail(arr) { + return arr.length && arr[arr.length - 1] || undefined; +} +/** + * shallow copy from src to dest + */ +function copy(src, dest) { + if (dest) + Object.keys(dest).forEach(function (key) { return delete dest[key]; }); + if (!dest) + dest = {}; + return extend(dest, src); +} +/** Naive forEach implementation works with Objects or Arrays */ +function _forEach(obj, cb, _this) { + if (isArray(obj)) + return obj.forEach(cb, _this); + Object.keys(obj).forEach(function (key) { return cb(obj[key], key); }); +} +function _extend(toObj) { + for (var i = 1; i < arguments.length; i++) { + var obj = arguments[i]; + if (!obj) + continue; + var keys = Object.keys(obj); + for (var j = 0; j < keys.length; j++) { + toObj[keys[j]] = obj[keys[j]]; + } + } + return toObj; +} +function _equals(o1, o2) { + if (o1 === o2) + return true; + if (o1 === null || o2 === null) + return false; + if (o1 !== o1 && o2 !== o2) + return true; // NaN === NaN + var t1 = typeof o1, t2 = typeof o2; + if (t1 !== t2 || t1 !== 'object') + return false; + var tup = [o1, o2]; + if (all(isArray)(tup)) + return _arraysEq(o1, o2); + if (all(isDate)(tup)) + return o1.getTime() === o2.getTime(); + if (all(isRegExp)(tup)) + return o1.toString() === o2.toString(); + if (all(isFunction)(tup)) + return true; // meh + var predicates = [isFunction, isArray, isDate, isRegExp]; + if (predicates.map(any).reduce(function (b, fn) { return b || !!fn(tup); }, false)) + return false; + var key, keys = {}; + for (key in o1) { + if (!_equals(o1[key], o2[key])) + return false; + keys[key] = true; + } + for (key in o2) { + if (!keys[key]) + return false; + } + return true; +} +function _arraysEq(a1, a2) { + if (a1.length !== a2.length) + return false; + return arrayTuples(a1, a2).reduce(function (b, t) { return b && _equals(t[0], t[1]); }, true); +} +// issue #2676 +var silenceUncaughtInPromise = function (promise) { + return promise.catch(function (e) { return 0; }) && promise; +}; +var silentRejection = function (error) { + return silenceUncaughtInPromise(services.$q.reject(error)); +}; + +/** + * @module common + */ /** for typedoc */ +var Queue = /** @class */ (function () { + function Queue(_items, _limit) { + if (_items === void 0) { _items = []; } + if (_limit === void 0) { _limit = null; } + this._items = _items; + this._limit = _limit; + } + Queue.prototype.enqueue = function (item) { + var items = this._items; + items.push(item); + if (this._limit && items.length > this._limit) + items.shift(); + return item; + }; + Queue.prototype.dequeue = function () { + if (this.size()) + return this._items.splice(0, 1)[0]; + }; + Queue.prototype.clear = function () { + var current = this._items; + this._items = []; + return current; + }; + Queue.prototype.size = function () { + return this._items.length; + }; + Queue.prototype.remove = function (item) { + var idx = this._items.indexOf(item); + return idx > -1 && this._items.splice(idx, 1)[0]; + }; + Queue.prototype.peekTail = function () { + return this._items[this._items.length - 1]; + }; + Queue.prototype.peekHead = function () { + if (this.size()) + return this._items[0]; + }; + return Queue; +}()); + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +"use strict"; + +(function (RejectType) { + RejectType[RejectType["SUPERSEDED"] = 2] = "SUPERSEDED"; + RejectType[RejectType["ABORTED"] = 3] = "ABORTED"; + RejectType[RejectType["INVALID"] = 4] = "INVALID"; + RejectType[RejectType["IGNORED"] = 5] = "IGNORED"; + RejectType[RejectType["ERROR"] = 6] = "ERROR"; +})(exports.RejectType || (exports.RejectType = {})); +/** @hidden */ var id = 0; +var Rejection = /** @class */ (function () { + function Rejection(type, message, detail) { + this.$id = id++; + this.type = type; + this.message = message; + this.detail = detail; + } + Rejection.prototype.toString = function () { + var detailString = function (d) { + return d && d.toString !== Object.prototype.toString ? d.toString() : stringify(d); + }; + var detail = detailString(this.detail); + var _a = this, $id = _a.$id, type = _a.type, message = _a.message; + return "Transition Rejection($id: " + $id + " type: " + type + ", message: " + message + ", detail: " + detail + ")"; + }; + Rejection.prototype.toPromise = function () { + return extend(silentRejection(this), { _transitionRejection: this }); + }; + /** Returns true if the obj is a rejected promise created from the `asPromise` factory */ + Rejection.isRejectionPromise = function (obj) { + return obj && (typeof obj.then === 'function') && is(Rejection)(obj._transitionRejection); + }; + /** Returns a Rejection due to transition superseded */ + Rejection.superseded = function (detail, options) { + var message = "The transition has been superseded by a different transition"; + var rejection = new Rejection(exports.RejectType.SUPERSEDED, message, detail); + if (options && options.redirected) { + rejection.redirected = true; + } + return rejection; + }; + /** Returns a Rejection due to redirected transition */ + Rejection.redirected = function (detail) { + return Rejection.superseded(detail, { redirected: true }); + }; + /** Returns a Rejection due to invalid transition */ + Rejection.invalid = function (detail) { + var message = "This transition is invalid"; + return new Rejection(exports.RejectType.INVALID, message, detail); + }; + /** Returns a Rejection due to ignored transition */ + Rejection.ignored = function (detail) { + var message = "The transition was ignored"; + return new Rejection(exports.RejectType.IGNORED, message, detail); + }; + /** Returns a Rejection due to aborted transition */ + Rejection.aborted = function (detail) { + var message = "The transition has been aborted"; + return new Rejection(exports.RejectType.ABORTED, message, detail); + }; + /** Returns a Rejection due to aborted transition */ + Rejection.errored = function (detail) { + var message = "The transition errored"; + return new Rejection(exports.RejectType.ERROR, message, detail); + }; + /** + * Returns a Rejection + * + * Normalizes a value as a Rejection. + * If the value is already a Rejection, returns it. + * Otherwise, wraps and returns the value as a Rejection (Rejection type: ERROR). + * + * @returns `detail` if it is already a `Rejection`, else returns an ERROR Rejection. + */ + Rejection.normalize = function (detail) { + return is(Rejection)(detail) ? detail : Rejection.errored(detail); + }; + return Rejection; +}()); + +/** + * # Transition tracing (debug) + * + * Enable transition tracing to print transition information to the console, + * in order to help debug your application. + * Tracing logs detailed information about each Transition to your console. + * + * To enable tracing, import the [[Trace]] singleton and enable one or more categories. + * + * ### ES6 + * ```js + * import {trace} from "ui-router-ng2"; // or "angular-ui-router" + * trace.enable(1, 5); // TRANSITION and VIEWCONFIG + * ``` + * + * ### CJS + * ```js + * let trace = require("angular-ui-router").trace; // or "ui-router-ng2" + * trace.enable("TRANSITION", "VIEWCONFIG"); + * ``` + * + * ### Globals + * ```js + * let trace = window["angular-ui-router"].trace; // or "ui-router-ng2" + * trace.enable(); // Trace everything (very verbose) + * ``` + * + * ### Angular 1: + * ```js + * app.run($trace => $trace.enable()); + * ``` + * + * @coreapi + * @module trace + */ /** for typedoc */ +/** @hidden */ +function uiViewString(uiview) { + if (!uiview) + return 'ui-view (defunct)'; + var state = uiview.creationContext ? uiview.creationContext.name || '(root)' : '(none)'; + return "[ui-view#" + uiview.id + " " + uiview.$type + ":" + uiview.fqn + " (" + uiview.name + "@" + state + ")]"; +} +/** @hidden */ +var viewConfigString = function (viewConfig) { + var view = viewConfig.viewDecl; + var state = view.$context.name || '(root)'; + return "[View#" + viewConfig.$id + " from '" + state + "' state]: target ui-view: '" + view.$uiViewName + "@" + view.$uiViewContextAnchor + "'"; +}; +/** @hidden */ +function normalizedCat(input) { + return isNumber(input) ? exports.Category[input] : exports.Category[exports.Category[input]]; +} +/** @hidden */ +var consoleLog = Function.prototype.bind.call(console.log, console); +/** @hidden */ +var consoletable = isFunction(console.table) ? console.table.bind(console) : consoleLog.bind(console); +/** + * Trace categories Enum + * + * Enable or disable a category using [[Trace.enable]] or [[Trace.disable]] + * + * `trace.enable(Category.TRANSITION)` + * + * These can also be provided using a matching string, or position ordinal + * + * `trace.enable("TRANSITION")` + * + * `trace.enable(1)` + */ + +(function (Category) { + Category[Category["RESOLVE"] = 0] = "RESOLVE"; + Category[Category["TRANSITION"] = 1] = "TRANSITION"; + Category[Category["HOOK"] = 2] = "HOOK"; + Category[Category["UIVIEW"] = 3] = "UIVIEW"; + Category[Category["VIEWCONFIG"] = 4] = "VIEWCONFIG"; +})(exports.Category || (exports.Category = {})); +/** @hidden */ var _tid = parse("$id"); +/** @hidden */ var _rid = parse("router.$id"); +/** @hidden */ var transLbl = function (trans) { return "Transition #" + _tid(trans) + "-" + _rid(trans); }; +/** + * Prints UI-Router Transition trace information to the console. + */ +var Trace = /** @class */ (function () { + /** @hidden */ + function Trace() { + /** @hidden */ + this._enabled = {}; + this.approximateDigests = 0; + } + /** @hidden */ + Trace.prototype._set = function (enabled, categories) { + var _this = this; + if (!categories.length) { + categories = Object.keys(exports.Category) + .map(function (k) { return parseInt(k, 10); }) + .filter(function (k) { return !isNaN(k); }) + .map(function (key) { return exports.Category[key]; }); + } + categories.map(normalizedCat).forEach(function (category) { return _this._enabled[category] = enabled; }); + }; + Trace.prototype.enable = function () { + var categories = []; + for (var _i = 0; _i < arguments.length; _i++) { + categories[_i] = arguments[_i]; + } + this._set(true, categories); + }; + Trace.prototype.disable = function () { + var categories = []; + for (var _i = 0; _i < arguments.length; _i++) { + categories[_i] = arguments[_i]; + } + this._set(false, categories); + }; + /** + * Retrieves the enabled stateus of a [[Category]] + * + * ```js + * trace.enabled("VIEWCONFIG"); // true or false + * ``` + * + * @returns boolean true if the category is enabled + */ + Trace.prototype.enabled = function (category) { + return !!this._enabled[normalizedCat(category)]; + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceTransitionStart = function (trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": Started -> " + stringify(trans)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceTransitionIgnored = function (trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": Ignored <> " + stringify(trans)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceHookInvocation = function (step, trans, options) { + if (!this.enabled(exports.Category.HOOK)) + return; + var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = functionToString(step.registeredHook.callback); + console.log(transLbl(trans) + ": Hook -> " + event + " context: " + context + ", " + maxLength(200, name)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceHookResult = function (hookResult, trans, transitionOptions) { + if (!this.enabled(exports.Category.HOOK)) + return; + console.log(transLbl(trans) + ": <- Hook returned: " + maxLength(200, stringify(hookResult))); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceResolvePath = function (path, when, trans) { + if (!this.enabled(exports.Category.RESOLVE)) + return; + console.log(transLbl(trans) + ": Resolving " + path + " (" + when + ")"); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceResolvableResolved = function (resolvable, trans) { + if (!this.enabled(exports.Category.RESOLVE)) + return; + console.log(transLbl(trans) + ": <- Resolved " + resolvable + " to: " + maxLength(200, stringify(resolvable.data))); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceError = function (reason, trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": <- Rejected " + stringify(trans) + ", reason: " + reason); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceSuccess = function (finalState, trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": <- Success " + stringify(trans) + ", final state: " + finalState.name); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewEvent = function (event, viewData, extra) { + if (extra === void 0) { extra = ""; } + if (!this.enabled(exports.Category.UIVIEW)) + return; + console.log("ui-view: " + padString(30, event) + " " + uiViewString(viewData) + extra); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewConfigUpdated = function (viewData, context) { + if (!this.enabled(exports.Category.UIVIEW)) + return; + this.traceUIViewEvent("Updating", viewData, " with ViewConfig from context='" + context + "'"); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewFill = function (viewData, html) { + if (!this.enabled(exports.Category.UIVIEW)) + return; + this.traceUIViewEvent("Fill", viewData, " with: " + maxLength(200, html)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewSync = function (pairs) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + var mapping = pairs.map(function (_a) { + var uiViewData = _a[0], config = _a[1]; + var uiView = uiViewData.$type + ":" + uiViewData.fqn; + var view = config && config.viewDecl.$context.name + ": " + config.viewDecl.$name + " (" + config.viewDecl.$type + ")"; + return { 'ui-view fqn': uiView, 'state: view name': view }; + }).sort(function (a, b) { return a['ui-view fqn'].localeCompare(b['ui-view fqn']); }); + consoletable(mapping); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewServiceEvent = function (event, viewConfig) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + console.log("VIEWCONFIG: " + event + " " + viewConfigString(viewConfig)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewServiceUIViewEvent = function (event, viewData) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + console.log("VIEWCONFIG: " + event + " " + uiViewString(viewData)); + }; + return Trace; +}()); +/** + * The [[Trace]] singleton + * + * #### Example: + * ```js + * import {trace} from "angular-ui-router"; + * trace.enable(1, 5); + * ``` + */ +var trace = new Trace(); + +(function (TransitionHookPhase) { + TransitionHookPhase[TransitionHookPhase["CREATE"] = 0] = "CREATE"; + TransitionHookPhase[TransitionHookPhase["BEFORE"] = 1] = "BEFORE"; + TransitionHookPhase[TransitionHookPhase["RUN"] = 2] = "RUN"; + TransitionHookPhase[TransitionHookPhase["SUCCESS"] = 3] = "SUCCESS"; + TransitionHookPhase[TransitionHookPhase["ERROR"] = 4] = "ERROR"; +})(exports.TransitionHookPhase || (exports.TransitionHookPhase = {})); + +(function (TransitionHookScope) { + TransitionHookScope[TransitionHookScope["TRANSITION"] = 0] = "TRANSITION"; + TransitionHookScope[TransitionHookScope["STATE"] = 1] = "STATE"; +})(exports.TransitionHookScope || (exports.TransitionHookScope = {})); + +/** + * @coreapi + * @module state + */ /** for typedoc */ +/** + * Encapsulate the target (destination) state/params/options of a [[Transition]]. + * + * This class is frequently used to redirect a transition to a new destination. + * + * See: + * + * - [[HookResult]] + * - [[TransitionHookFn]] + * - [[TransitionService.onStart]] + * + * To create a `TargetState`, use [[StateService.target]]. + * + * --- + * + * This class wraps: + * + * 1) an identifier for a state + * 2) a set of parameters + * 3) and transition options + * 4) the registered state object (the [[StateDeclaration]]) + * + * Many UI-Router APIs such as [[StateService.go]] take a [[StateOrName]] argument which can + * either be a *state object* (a [[StateDeclaration]] or [[StateObject]]) or a *state name* (a string). + * The `TargetState` class normalizes those options. + * + * A `TargetState` may be valid (the state being targeted exists in the registry) + * or invalid (the state being targeted is not registered). + */ +var TargetState = /** @class */ (function () { + /** + * The TargetState constructor + * + * Note: Do not construct a `TargetState` manually. + * To create a `TargetState`, use the [[StateService.target]] factory method. + * + * @param _stateRegistry The StateRegistry to use to look up the _definition + * @param _identifier An identifier for a state. + * Either a fully-qualified state name, or the object used to define the state. + * @param _params Parameters for the target state + * @param _options Transition options. + * + * @internalapi + */ + function TargetState(_stateRegistry, _identifier, _params, _options) { + this._stateRegistry = _stateRegistry; + this._identifier = _identifier; + this._identifier = _identifier; + this._params = extend({}, _params || {}); + this._options = extend({}, _options || {}); + this._definition = _stateRegistry.matcher.find(_identifier, this._options.relative); + } + /** The name of the state this object targets */ + TargetState.prototype.name = function () { + return this._definition && this._definition.name || this._identifier; + }; + /** The identifier used when creating this TargetState */ + TargetState.prototype.identifier = function () { + return this._identifier; + }; + /** The target parameter values */ + TargetState.prototype.params = function () { + return this._params; + }; + /** The internal state object (if it was found) */ + TargetState.prototype.$state = function () { + return this._definition; + }; + /** The internal state declaration (if it was found) */ + TargetState.prototype.state = function () { + return this._definition && this._definition.self; + }; + /** The target options */ + TargetState.prototype.options = function () { + return this._options; + }; + /** True if the target state was found */ + TargetState.prototype.exists = function () { + return !!(this._definition && this._definition.self); + }; + /** True if the object is valid */ + TargetState.prototype.valid = function () { + return !this.error(); + }; + /** If the object is invalid, returns the reason why */ + TargetState.prototype.error = function () { + var base = this.options().relative; + if (!this._definition && !!base) { + var stateName = base.name ? base.name : base; + return "Could not resolve '" + this.name() + "' from state '" + stateName + "'"; + } + if (!this._definition) + return "No such state '" + this.name() + "'"; + if (!this._definition.self) + return "State '" + this.name() + "' has an invalid definition"; + }; + TargetState.prototype.toString = function () { + return "'" + this.name() + "'" + stringify(this.params()); + }; + /** + * Returns a copy of this TargetState which targets a different state. + * The new TargetState has the same parameter values and transition options. + * + * @param state The new state that should be targeted + */ + TargetState.prototype.withState = function (state) { + return new TargetState(this._stateRegistry, state, this._params, this._options); + }; + /** + * Returns a copy of this TargetState, using the specified parameter values. + * + * @param params the new parameter values to use + * @param replace When false (default) the new parameter values will be merged with the current values. + * When true the parameter values will be used instead of the current values. + */ + TargetState.prototype.withParams = function (params, replace) { + if (replace === void 0) { replace = false; } + var newParams = replace ? params : extend({}, this._params, params); + return new TargetState(this._stateRegistry, this._identifier, newParams, this._options); + }; + /** + * Returns a copy of this TargetState, using the specified Transition Options. + * + * @param options the new options to use + * @param replace When false (default) the new options will be merged with the current options. + * When true the options will be used instead of the current options. + */ + TargetState.prototype.withOptions = function (options, replace) { + if (replace === void 0) { replace = false; } + var newOpts = replace ? options : extend({}, this._options, options); + return new TargetState(this._stateRegistry, this._identifier, this._params, newOpts); + }; + /** Returns true if the object has a state property that might be a state or state name */ + TargetState.isDef = function (obj) { + return obj && obj.state && (isString(obj.state) || isString(obj.state.name)); + }; + return TargetState; +}()); + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +var defaultOptions = { + current: noop$1, + transition: null, + traceData: {}, + bind: null, +}; +/** @hidden */ +var TransitionHook = /** @class */ (function () { + function TransitionHook(transition, stateContext, registeredHook, options) { + var _this = this; + this.transition = transition; + this.stateContext = stateContext; + this.registeredHook = registeredHook; + this.options = options; + this.isSuperseded = function () { + return _this.type.hookPhase === exports.TransitionHookPhase.RUN && !_this.options.transition.isActive(); + }; + this.options = defaults(options, defaultOptions); + this.type = registeredHook.eventType; + } + TransitionHook.prototype.logError = function (err) { + this.transition.router.stateService.defaultErrorHandler()(err); + }; + TransitionHook.prototype.invokeHook = function () { + var _this = this; + var hook = this.registeredHook; + if (hook._deregistered) + return; + var notCurrent = this.getNotCurrentRejection(); + if (notCurrent) + return notCurrent; + var options = this.options; + trace.traceHookInvocation(this, this.transition, options); + var invokeCallback = function () { + return hook.callback.call(options.bind, _this.transition, _this.stateContext); + }; + var normalizeErr = function (err) { + return Rejection.normalize(err).toPromise(); + }; + var handleError = function (err) { + return hook.eventType.getErrorHandler(_this)(err); + }; + var handleResult = function (result) { + return hook.eventType.getResultHandler(_this)(result); + }; + try { + var result = invokeCallback(); + if (!this.type.synchronous && isPromise(result)) { + return result.catch(normalizeErr) + .then(handleResult, handleError); + } + else { + return handleResult(result); + } + } + catch (err) { + // If callback throws (synchronously) + return handleError(Rejection.normalize(err)); + } + finally { + if (hook.invokeLimit && ++hook.invokeCount >= hook.invokeLimit) { + hook.deregister(); + } + } + }; + /** + * This method handles the return value of a Transition Hook. + * + * A hook can return false (cancel), a TargetState (redirect), + * or a promise (which may later resolve to false or a redirect) + * + * This also handles "transition superseded" -- when a new transition + * was started while the hook was still running + */ + TransitionHook.prototype.handleHookResult = function (result) { + var _this = this; + var notCurrent = this.getNotCurrentRejection(); + if (notCurrent) + return notCurrent; + // Hook returned a promise + if (isPromise(result)) { + // Wait for the promise, then reprocess with the resulting value + return result.then(function (val$$1) { return _this.handleHookResult(val$$1); }); + } + trace.traceHookResult(result, this.transition, this.options); + // Hook returned false + if (result === false) { + // Abort this Transition + return Rejection.aborted("Hook aborted transition").toPromise(); + } + var isTargetState = is(TargetState); + // hook returned a TargetState + if (isTargetState(result)) { + // Halt the current Transition and redirect (a new Transition) to the TargetState. + return Rejection.redirected(result).toPromise(); + } + }; + /** + * Return a Rejection promise if the transition is no longer current due + * to a stopped router (disposed), or a new transition has started and superseded this one. + */ + TransitionHook.prototype.getNotCurrentRejection = function () { + var router = this.transition.router; + // The router is stopped + if (router._disposed) { + return Rejection.aborted("UIRouter instance #" + router.$id + " has been stopped (disposed)").toPromise(); + } + if (this.transition._aborted) { + return Rejection.aborted().toPromise(); + } + // This transition is no longer current. + // Another transition started while this hook was still running. + if (this.isSuperseded()) { + // Abort this transition + return Rejection.superseded(this.options.current()).toPromise(); + } + }; + TransitionHook.prototype.toString = function () { + var _a = this, options = _a.options, registeredHook = _a.registeredHook; + var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = fnToString(registeredHook.callback); + return event + " context: " + context + ", " + maxLength(200, name); + }; + /** + * Chains together an array of TransitionHooks. + * + * Given a list of [[TransitionHook]] objects, chains them together. + * Each hook is invoked after the previous one completes. + * + * #### Example: + * ```js + * var hooks: TransitionHook[] = getHooks(); + * let promise: Promise = TransitionHook.chain(hooks); + * + * promise.then(handleSuccess, handleError); + * ``` + * + * @param hooks the list of hooks to chain together + * @param waitFor if provided, the chain is `.then()`'ed off this promise + * @returns a `Promise` for sequentially invoking the hooks (in order) + */ + TransitionHook.chain = function (hooks, waitFor) { + // Chain the next hook off the previous + var createHookChainR = function (prev, nextHook) { + return prev.then(function () { return nextHook.invokeHook(); }); + }; + return hooks.reduce(createHookChainR, waitFor || services.$q.when()); + }; + /** + * Invokes all the provided TransitionHooks, in order. + * Each hook's return value is checked. + * If any hook returns a promise, then the rest of the hooks are chained off that promise, and the promise is returned. + * If no hook returns a promise, then all hooks are processed synchronously. + * + * @param hooks the list of TransitionHooks to invoke + * @param doneCallback a callback that is invoked after all the hooks have successfully completed + * + * @returns a promise for the async result, or the result of the callback + */ + TransitionHook.invokeHooks = function (hooks, doneCallback) { + for (var idx = 0; idx < hooks.length; idx++) { + var hookResult = hooks[idx].invokeHook(); + if (isPromise(hookResult)) { + var remainingHooks = hooks.slice(idx + 1); + return TransitionHook.chain(remainingHooks, hookResult) + .then(doneCallback); + } + } + return doneCallback(); + }; + /** + * Run all TransitionHooks, ignoring their return value. + */ + TransitionHook.runAllHooks = function (hooks) { + hooks.forEach(function (hook) { return hook.invokeHook(); }); + }; + /** + * These GetResultHandler(s) are used by [[invokeHook]] below + * Each HookType chooses a GetResultHandler (See: [[TransitionService._defineCoreEvents]]) + */ + TransitionHook.HANDLE_RESULT = function (hook) { return function (result) { + return hook.handleHookResult(result); + }; }; + /** + * If the result is a promise rejection, log it. + * Otherwise, ignore the result. + */ + TransitionHook.LOG_REJECTED_RESULT = function (hook) { return function (result) { + isPromise(result) && result.catch(function (err) { + return hook.logError(Rejection.normalize(err)); + }); + return undefined; + }; }; + /** + * These GetErrorHandler(s) are used by [[invokeHook]] below + * Each HookType chooses a GetErrorHandler (See: [[TransitionService._defineCoreEvents]]) + */ + TransitionHook.LOG_ERROR = function (hook) { return function (error) { + return hook.logError(error); + }; }; + TransitionHook.REJECT_ERROR = function (hook) { return function (error) { + return silentRejection(error); + }; }; + TransitionHook.THROW_ERROR = function (hook) { return function (error) { + throw error; + }; }; + return TransitionHook; +}()); + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +/** + * Determines if the given state matches the matchCriteria + * + * @hidden + * + * @param state a State Object to test against + * @param criterion + * - If a string, matchState uses the string as a glob-matcher against the state name + * - If an array (of strings), matchState uses each string in the array as a glob-matchers against the state name + * and returns a positive match if any of the globs match. + * - If a function, matchState calls the function with the state and returns true if the function's result is truthy. + * @returns {boolean} + */ +function matchState(state, criterion) { + var toMatch = isString(criterion) ? [criterion] : criterion; + function matchGlobs(_state) { + var globStrings = toMatch; + for (var i = 0; i < globStrings.length; i++) { + var glob = new Glob(globStrings[i]); + if ((glob && glob.matches(_state.name)) || (!glob && globStrings[i] === _state.name)) { + return true; + } + } + return false; + } + var matchFn = (isFunction(toMatch) ? toMatch : matchGlobs); + return !!matchFn(state); +} +/** + * @internalapi + * The registration data for a registered transition hook + */ +var RegisteredHook = /** @class */ (function () { + function RegisteredHook(tranSvc, eventType, callback, matchCriteria, removeHookFromRegistry, options) { + if (options === void 0) { options = {}; } + this.tranSvc = tranSvc; + this.eventType = eventType; + this.callback = callback; + this.matchCriteria = matchCriteria; + this.removeHookFromRegistry = removeHookFromRegistry; + this.invokeCount = 0; + this._deregistered = false; + this.priority = options.priority || 0; + this.bind = options.bind || null; + this.invokeLimit = options.invokeLimit; + } + /** + * Gets the matching [[PathNode]]s + * + * Given an array of [[PathNode]]s, and a [[HookMatchCriterion]], returns an array containing + * the [[PathNode]]s that the criteria matches, or `null` if there were no matching nodes. + * + * Returning `null` is significant to distinguish between the default + * "match-all criterion value" of `true` compared to a `() => true` function, + * when the nodes is an empty array. + * + * This is useful to allow a transition match criteria of `entering: true` + * to still match a transition, even when `entering === []`. Contrast that + * with `entering: (state) => true` which only matches when a state is actually + * being entered. + */ + RegisteredHook.prototype._matchingNodes = function (nodes, criterion) { + if (criterion === true) + return nodes; + var matching = nodes.filter(function (node) { return matchState(node.state, criterion); }); + return matching.length ? matching : null; + }; + /** + * Gets the default match criteria (all `true`) + * + * Returns an object which has all the criteria match paths as keys and `true` as values, i.e.: + * + * ```js + * { + * to: true, + * from: true, + * entering: true, + * exiting: true, + * retained: true, + * } + */ + RegisteredHook.prototype._getDefaultMatchCriteria = function () { + return map(this.tranSvc._pluginapi._getPathTypes(), function () { return true; }); + }; + /** + * Gets matching nodes as [[IMatchingNodes]] + * + * Create a IMatchingNodes object from the TransitionHookTypes that is roughly equivalent to: + * + * ```js + * let matches: IMatchingNodes = { + * to: _matchingNodes([tail(treeChanges.to)], mc.to), + * from: _matchingNodes([tail(treeChanges.from)], mc.from), + * exiting: _matchingNodes(treeChanges.exiting, mc.exiting), + * retained: _matchingNodes(treeChanges.retained, mc.retained), + * entering: _matchingNodes(treeChanges.entering, mc.entering), + * }; + * ``` + */ + RegisteredHook.prototype._getMatchingNodes = function (treeChanges) { + var _this = this; + var criteria = extend(this._getDefaultMatchCriteria(), this.matchCriteria); + var paths = values(this.tranSvc._pluginapi._getPathTypes()); + return paths.reduce(function (mn, pathtype) { + // STATE scope criteria matches against every node in the path. + // TRANSITION scope criteria matches against only the last node in the path + var isStateHook = pathtype.scope === exports.TransitionHookScope.STATE; + var path = treeChanges[pathtype.name] || []; + var nodes = isStateHook ? path : [tail(path)]; + mn[pathtype.name] = _this._matchingNodes(nodes, criteria[pathtype.name]); + return mn; + }, {}); + }; + /** + * Determines if this hook's [[matchCriteria]] match the given [[TreeChanges]] + * + * @returns an IMatchingNodes object, or null. If an IMatchingNodes object is returned, its values + * are the matching [[PathNode]]s for each [[HookMatchCriterion]] (to, from, exiting, retained, entering) + */ + RegisteredHook.prototype.matches = function (treeChanges) { + var matches = this._getMatchingNodes(treeChanges); + // Check if all the criteria matched the TreeChanges object + var allMatched = values(matches).every(identity); + return allMatched ? matches : null; + }; + RegisteredHook.prototype.deregister = function () { + this.removeHookFromRegistry(this); + this._deregistered = true; + }; + return RegisteredHook; +}()); +/** @hidden Return a registration function of the requested type. */ +function makeEvent(registry, transitionService, eventType) { + // Create the object which holds the registered transition hooks. + var _registeredHooks = registry._registeredHooks = (registry._registeredHooks || {}); + var hooks = _registeredHooks[eventType.name] = []; + var removeHookFn = removeFrom(hooks); + // Create hook registration function on the IHookRegistry for the event + registry[eventType.name] = hookRegistrationFn; + function hookRegistrationFn(matchObject, callback, options) { + if (options === void 0) { options = {}; } + var registeredHook = new RegisteredHook(transitionService, eventType, callback, matchObject, removeHookFn, options); + hooks.push(registeredHook); + return registeredHook.deregister.bind(registeredHook); + } + return hookRegistrationFn; +} + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +/** + * This class returns applicable TransitionHooks for a specific Transition instance. + * + * Hooks ([[RegisteredHook]]) may be registered globally, e.g., $transitions.onEnter(...), or locally, e.g. + * myTransition.onEnter(...). The HookBuilder finds matching RegisteredHooks (where the match criteria is + * determined by the type of hook) + * + * The HookBuilder also converts RegisteredHooks objects to TransitionHook objects, which are used to run a Transition. + * + * The HookBuilder constructor is given the $transitions service and a Transition instance. Thus, a HookBuilder + * instance may only be used for one specific Transition object. (side note: the _treeChanges accessor is private + * in the Transition class, so we must also provide the Transition's _treeChanges) + * + */ +var HookBuilder = /** @class */ (function () { + function HookBuilder(transition) { + this.transition = transition; + } + HookBuilder.prototype.buildHooksForPhase = function (phase) { + var _this = this; + var $transitions = this.transition.router.transitionService; + return $transitions._pluginapi._getEvents(phase) + .map(function (type) { return _this.buildHooks(type); }) + .reduce(unnestR, []) + .filter(identity); + }; + /** + * Returns an array of newly built TransitionHook objects. + * + * - Finds all RegisteredHooks registered for the given `hookType` which matched the transition's [[TreeChanges]]. + * - Finds [[PathNode]] (or `PathNode[]`) to use as the TransitionHook context(s) + * - For each of the [[PathNode]]s, creates a TransitionHook + * + * @param hookType the type of the hook registration function, e.g., 'onEnter', 'onFinish'. + */ + HookBuilder.prototype.buildHooks = function (hookType) { + var transition = this.transition; + var treeChanges = transition.treeChanges(); + // Find all the matching registered hooks for a given hook type + var matchingHooks = this.getMatchingHooks(hookType, treeChanges); + if (!matchingHooks) + return []; + var baseHookOptions = { + transition: transition, + current: transition.options().current + }; + var makeTransitionHooks = function (hook) { + // Fetch the Nodes that caused this hook to match. + var matches = hook.matches(treeChanges); + // Select the PathNode[] that will be used as TransitionHook context objects + var matchingNodes = matches[hookType.criteriaMatchPath.name]; + // Return an array of HookTuples + return matchingNodes.map(function (node) { + var _options = extend({ + bind: hook.bind, + traceData: { hookType: hookType.name, context: node } + }, baseHookOptions); + var state = hookType.criteriaMatchPath.scope === exports.TransitionHookScope.STATE ? node.state.self : null; + var transitionHook = new TransitionHook(transition, state, hook, _options); + return { hook: hook, node: node, transitionHook: transitionHook }; + }); + }; + return matchingHooks.map(makeTransitionHooks) + .reduce(unnestR, []) + .sort(tupleSort(hookType.reverseSort)) + .map(function (tuple) { return tuple.transitionHook; }); + }; + /** + * Finds all RegisteredHooks from: + * - The Transition object instance hook registry + * - The TransitionService ($transitions) global hook registry + * + * which matched: + * - the eventType + * - the matchCriteria (to, from, exiting, retained, entering) + * + * @returns an array of matched [[RegisteredHook]]s + */ + HookBuilder.prototype.getMatchingHooks = function (hookType, treeChanges) { + var isCreate = hookType.hookPhase === exports.TransitionHookPhase.CREATE; + // Instance and Global hook registries + var $transitions = this.transition.router.transitionService; + var registries = isCreate ? [$transitions] : [this.transition, $transitions]; + return registries.map(function (reg) { return reg.getHooks(hookType.name); }) // Get named hooks from registries + .filter(assertPredicate(isArray, "broken event named: " + hookType.name)) // Sanity check + .reduce(unnestR, []) // Un-nest RegisteredHook[][] to RegisteredHook[] array + .filter(function (hook) { return hook.matches(treeChanges); }); // Only those satisfying matchCriteria + }; + return HookBuilder; +}()); +/** + * A factory for a sort function for HookTuples. + * + * The sort function first compares the PathNode depth (how deep in the state tree a node is), then compares + * the EventHook priority. + * + * @param reverseDepthSort a boolean, when true, reverses the sort order for the node depth + * @returns a tuple sort function + */ +function tupleSort(reverseDepthSort) { + if (reverseDepthSort === void 0) { reverseDepthSort = false; } + return function nodeDepthThenPriority(l, r) { + var factor = reverseDepthSort ? -1 : 1; + var depthDelta = (l.node.state.path.length - r.node.state.path.length) * factor; + return depthDelta !== 0 ? depthDelta : r.hook.priority - l.hook.priority; + }; +} + +/** + * @coreapi + * @module params + */ +/** */ +/** + * An internal class which implements [[ParamTypeDefinition]]. + * + * A [[ParamTypeDefinition]] is a plain javascript object used to register custom parameter types. + * When a param type definition is registered, an instance of this class is created internally. + * + * This class has naive implementations for all the [[ParamTypeDefinition]] methods. + * + * Used by [[UrlMatcher]] when matching or formatting URLs, or comparing and validating parameter values. + * + * #### Example: + * ```js + * var paramTypeDef = { + * decode: function(val) { return parseInt(val, 10); }, + * encode: function(val) { return val && val.toString(); }, + * equals: function(a, b) { return this.is(a) && a === b; }, + * is: function(val) { return angular.isNumber(val) && isFinite(val) && val % 1 === 0; }, + * pattern: /\d+/ + * } + * + * var paramType = new ParamType(paramTypeDef); + * ``` + * @internalapi + */ +var ParamType = /** @class */ (function () { + /** + * @param def A configuration object which contains the custom type definition. The object's + * properties will override the default methods and/or pattern in `ParamType`'s public interface. + * @returns a new ParamType object + */ + function ParamType(def) { + /** @inheritdoc */ + this.pattern = /.*/; + /** @inheritdoc */ + this.inherit = true; + extend(this, def); + } + // consider these four methods to be "abstract methods" that should be overridden + /** @inheritdoc */ + ParamType.prototype.is = function (val, key) { return true; }; + /** @inheritdoc */ + ParamType.prototype.encode = function (val, key) { return val; }; + /** @inheritdoc */ + ParamType.prototype.decode = function (val, key) { return val; }; + /** @inheritdoc */ + ParamType.prototype.equals = function (a, b) { return a == b; }; + ParamType.prototype.$subPattern = function () { + var sub = this.pattern.toString(); + return sub.substr(1, sub.length - 2); + }; + ParamType.prototype.toString = function () { + return "{ParamType:" + this.name + "}"; + }; + /** Given an encoded string, or a decoded object, returns a decoded object */ + ParamType.prototype.$normalize = function (val) { + return this.is(val) ? val : this.decode(val); + }; + /** + * Wraps an existing custom ParamType as an array of ParamType, depending on 'mode'. + * e.g.: + * - urlmatcher pattern "/path?{queryParam[]:int}" + * - url: "/path?queryParam=1&queryParam=2 + * - $stateParams.queryParam will be [1, 2] + * if `mode` is "auto", then + * - url: "/path?queryParam=1 will create $stateParams.queryParam: 1 + * - url: "/path?queryParam=1&queryParam=2 will create $stateParams.queryParam: [1, 2] + */ + ParamType.prototype.$asArray = function (mode, isSearch) { + if (!mode) + return this; + if (mode === "auto" && !isSearch) + throw new Error("'auto' array mode is for query parameters only"); + return new ArrayType(this, mode); + }; + return ParamType; +}()); +/** + * Wraps up a `ParamType` object to handle array values. + * @internalapi + */ +function ArrayType(type, mode) { + var _this = this; + // Wrap non-array value as array + function arrayWrap(val) { + return isArray(val) ? val : (isDefined(val) ? [val] : []); + } + // Unwrap array value for "auto" mode. Return undefined for empty array. + function arrayUnwrap(val) { + switch (val.length) { + case 0: return undefined; + case 1: return mode === "auto" ? val[0] : val; + default: return val; + } + } + // Wraps type (.is/.encode/.decode) functions to operate on each value of an array + function arrayHandler(callback, allTruthyMode) { + return function handleArray(val) { + if (isArray(val) && val.length === 0) + return val; + var arr = arrayWrap(val); + var result = map(arr, callback); + return (allTruthyMode === true) ? filter(result, function (x) { return !x; }).length === 0 : arrayUnwrap(result); + }; + } + // Wraps type (.equals) functions to operate on each value of an array + function arrayEqualsHandler(callback) { + return function handleArray(val1, val2) { + var left = arrayWrap(val1), right = arrayWrap(val2); + if (left.length !== right.length) + return false; + for (var i = 0; i < left.length; i++) { + if (!callback(left[i], right[i])) + return false; + } + return true; + }; + } + ['encode', 'decode', 'equals', '$normalize'].forEach(function (name) { + var paramTypeFn = type[name].bind(type); + var wrapperFn = name === 'equals' ? arrayEqualsHandler : arrayHandler; + _this[name] = wrapperFn(paramTypeFn); + }); + extend(this, { + dynamic: type.dynamic, + name: type.name, + pattern: type.pattern, + inherit: type.inherit, + is: arrayHandler(type.is.bind(type), true), + $arrayMode: mode + }); +} + +/** + * @coreapi + * @module params + */ /** for typedoc */ +/** @hidden */ var hasOwn = Object.prototype.hasOwnProperty; +/** @hidden */ var isShorthand = function (cfg) { + return ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {})).length === 0; +}; +/** @internalapi */ + +(function (DefType) { + DefType[DefType["PATH"] = 0] = "PATH"; + DefType[DefType["SEARCH"] = 1] = "SEARCH"; + DefType[DefType["CONFIG"] = 2] = "CONFIG"; +})(exports.DefType || (exports.DefType = {})); +/** @hidden */ +function unwrapShorthand(cfg) { + cfg = isShorthand(cfg) && { value: cfg } || cfg; + getStaticDefaultValue['__cacheable'] = true; + function getStaticDefaultValue() { + return cfg.value; + } + return extend(cfg, { + $$fn: isInjectable(cfg.value) ? cfg.value : getStaticDefaultValue, + }); +} +/** @hidden */ +function getType(cfg, urlType, location, id, paramTypes) { + if (cfg.type && urlType && urlType.name !== 'string') + throw new Error("Param '" + id + "' has two type configurations."); + if (cfg.type && urlType && urlType.name === 'string' && paramTypes.type(cfg.type)) + return paramTypes.type(cfg.type); + if (urlType) + return urlType; + if (!cfg.type) { + var type = location === exports.DefType.CONFIG ? "any" : + location === exports.DefType.PATH ? "path" : + location === exports.DefType.SEARCH ? "query" : "string"; + return paramTypes.type(type); + } + return cfg.type instanceof ParamType ? cfg.type : paramTypes.type(cfg.type); +} +/** + * @internalapi + * returns false, true, or the squash value to indicate the "default parameter url squash policy". + */ +function getSquashPolicy(config, isOptional, defaultPolicy) { + var squash = config.squash; + if (!isOptional || squash === false) + return false; + if (!isDefined(squash) || squash == null) + return defaultPolicy; + if (squash === true || isString(squash)) + return squash; + throw new Error("Invalid squash policy: '" + squash + "'. Valid policies: false, true, or arbitrary string"); +} +/** @internalapi */ +function getReplace(config, arrayMode, isOptional, squash) { + var replace, configuredKeys, defaultPolicy = [ + { from: "", to: (isOptional || arrayMode ? undefined : "") }, + { from: null, to: (isOptional || arrayMode ? undefined : "") }, + ]; + replace = isArray(config.replace) ? config.replace : []; + if (isString(squash)) + replace.push({ from: squash, to: undefined }); + configuredKeys = map(replace, prop("from")); + return filter(defaultPolicy, function (item) { return configuredKeys.indexOf(item.from) === -1; }).concat(replace); +} +/** @internalapi */ +var Param = /** @class */ (function () { + function Param(id, type, config, location, urlMatcherFactory) { + config = unwrapShorthand(config); + type = getType(config, type, location, id, urlMatcherFactory.paramTypes); + var arrayMode = getArrayMode(); + type = arrayMode ? type.$asArray(arrayMode, location === exports.DefType.SEARCH) : type; + var isOptional = config.value !== undefined || location === exports.DefType.SEARCH; + var dynamic = isDefined(config.dynamic) ? !!config.dynamic : !!type.dynamic; + var raw = isDefined(config.raw) ? !!config.raw : !!type.raw; + var squash = getSquashPolicy(config, isOptional, urlMatcherFactory.defaultSquashPolicy()); + var replace = getReplace(config, arrayMode, isOptional, squash); + var inherit$$1 = isDefined(config.inherit) ? !!config.inherit : !!type.inherit; + // array config: param name (param[]) overrides default settings. explicit config overrides param name. + function getArrayMode() { + var arrayDefaults = { array: (location === exports.DefType.SEARCH ? "auto" : false) }; + var arrayParamNomenclature = id.match(/\[\]$/) ? { array: true } : {}; + return extend(arrayDefaults, arrayParamNomenclature, config).array; + } + extend(this, { id: id, type: type, location: location, isOptional: isOptional, dynamic: dynamic, raw: raw, squash: squash, replace: replace, inherit: inherit$$1, array: arrayMode, config: config }); + } + Param.prototype.isDefaultValue = function (value) { + return this.isOptional && this.type.equals(this.value(), value); + }; + /** + * [Internal] Gets the decoded representation of a value if the value is defined, otherwise, returns the + * default value, which may be the result of an injectable function. + */ + Param.prototype.value = function (value) { + var _this = this; + /** + * [Internal] Get the default value of a parameter, which may be an injectable function. + */ + var getDefaultValue = function () { + if (_this._defaultValueCache) + return _this._defaultValueCache.defaultValue; + if (!services.$injector) + throw new Error("Injectable functions cannot be called at configuration time"); + var defaultValue = services.$injector.invoke(_this.config.$$fn); + if (defaultValue !== null && defaultValue !== undefined && !_this.type.is(defaultValue)) + throw new Error("Default value (" + defaultValue + ") for parameter '" + _this.id + "' is not an instance of ParamType (" + _this.type.name + ")"); + if (_this.config.$$fn['__cacheable']) { + _this._defaultValueCache = { defaultValue: defaultValue }; + } + return defaultValue; + }; + var replaceSpecialValues = function (val$$1) { + for (var _i = 0, _a = _this.replace; _i < _a.length; _i++) { + var tuple = _a[_i]; + if (tuple.from === val$$1) + return tuple.to; + } + return val$$1; + }; + value = replaceSpecialValues(value); + return isUndefined(value) ? getDefaultValue() : this.type.$normalize(value); + }; + Param.prototype.isSearch = function () { + return this.location === exports.DefType.SEARCH; + }; + Param.prototype.validates = function (value) { + // There was no parameter value, but the param is optional + if ((isUndefined(value) || value === null) && this.isOptional) + return true; + // The value was not of the correct ParamType, and could not be decoded to the correct ParamType + var normalized = this.type.$normalize(value); + if (!this.type.is(normalized)) + return false; + // The value was of the correct type, but when encoded, did not match the ParamType's regexp + var encoded = this.type.encode(normalized); + return !(isString(encoded) && !this.type.pattern.exec(encoded)); + }; + Param.prototype.toString = function () { + return "{Param:" + this.id + " " + this.type + " squash: '" + this.squash + "' optional: " + this.isOptional + "}"; + }; + Param.values = function (params, values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + var paramValues = {}; + for (var _i = 0, params_1 = params; _i < params_1.length; _i++) { + var param = params_1[_i]; + paramValues[param.id] = param.value(values$$1[param.id]); + } + return paramValues; + }; + /** + * Finds [[Param]] objects which have different param values + * + * Filters a list of [[Param]] objects to only those whose parameter values differ in two param value objects + * + * @param params: The list of Param objects to filter + * @param values1: The first set of parameter values + * @param values2: the second set of parameter values + * + * @returns any Param objects whose values were different between values1 and values2 + */ + Param.changed = function (params, values1, values2) { + if (values1 === void 0) { values1 = {}; } + if (values2 === void 0) { values2 = {}; } + return params.filter(function (param) { return !param.type.equals(values1[param.id], values2[param.id]); }); + }; + /** + * Checks if two param value objects are equal (for a set of [[Param]] objects) + * + * @param params The list of [[Param]] objects to check + * @param values1 The first set of param values + * @param values2 The second set of param values + * + * @returns true if the param values in values1 and values2 are equal + */ + Param.equals = function (params, values1, values2) { + if (values1 === void 0) { values1 = {}; } + if (values2 === void 0) { values2 = {}; } + return Param.changed(params, values1, values2).length === 0; + }; + /** Returns true if a the parameter values are valid, according to the Param definitions */ + Param.validates = function (params, values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + return params.map(function (param) { return param.validates(values$$1[param.id]); }).reduce(allTrueR, true); + }; + return Param; +}()); + +/** @module path */ /** for typedoc */ +/** + * @internalapi + * + * A node in a [[TreeChanges]] path + * + * For a [[TreeChanges]] path, this class holds the stateful information for a single node in the path. + * Each PathNode corresponds to a state being entered, exited, or retained. + * The stateful information includes parameter values and resolve data. + */ +var PathNode = /** @class */ (function () { + function PathNode(stateOrNode) { + if (stateOrNode instanceof PathNode) { + var node = stateOrNode; + this.state = node.state; + this.paramSchema = node.paramSchema.slice(); + this.paramValues = extend({}, node.paramValues); + this.resolvables = node.resolvables.slice(); + this.views = node.views && node.views.slice(); + } + else { + var state = stateOrNode; + this.state = state; + this.paramSchema = state.parameters({ inherit: false }); + this.paramValues = {}; + this.resolvables = state.resolvables.map(function (res) { return res.clone(); }); + } + } + /** Sets [[paramValues]] for the node, from the values of an object hash */ + PathNode.prototype.applyRawParams = function (params) { + var getParamVal = function (paramDef) { return [paramDef.id, paramDef.value(params[paramDef.id])]; }; + this.paramValues = this.paramSchema.reduce(function (memo, pDef) { return applyPairs(memo, getParamVal(pDef)); }, {}); + return this; + }; + /** Gets a specific [[Param]] metadata that belongs to the node */ + PathNode.prototype.parameter = function (name) { + return find(this.paramSchema, propEq("id", name)); + }; + /** + * @returns true if the state and parameter values for another PathNode are + * equal to the state and param values for this PathNode + */ + PathNode.prototype.equals = function (node, paramsFn) { + var diff = this.diff(node, paramsFn); + return diff && diff.length === 0; + }; + /** + * Finds Params with different parameter values on another PathNode. + * + * Given another node (of the same state), finds the parameter values which differ. + * Returns the [[Param]] (schema objects) whose parameter values differ. + * + * Given another node for a different state, returns `false` + * + * @param node The node to compare to + * @param paramsFn A function that returns which parameters should be compared. + * @returns The [[Param]]s which differ, or null if the two nodes are for different states + */ + PathNode.prototype.diff = function (node, paramsFn) { + if (this.state !== node.state) + return false; + var params = paramsFn ? paramsFn(this) : this.paramSchema; + return Param.changed(params, this.paramValues, node.paramValues); + }; + /** Returns a clone of the PathNode */ + PathNode.clone = function (node) { + return new PathNode(node); + }; + return PathNode; +}()); + +/** @module path */ /** for typedoc */ +/** + * This class contains functions which convert TargetStates, Nodes and paths from one type to another. + */ +var PathUtils = /** @class */ (function () { + function PathUtils() { + } + /** Given a PathNode[], create an TargetState */ + PathUtils.makeTargetState = function (registry, path) { + var state = tail(path).state; + return new TargetState(registry, state, path.map(prop("paramValues")).reduce(mergeR, {}), {}); + }; + PathUtils.buildPath = function (targetState) { + var toParams = targetState.params(); + return targetState.$state().path.map(function (state) { return new PathNode(state).applyRawParams(toParams); }); + }; + /** Given a fromPath: PathNode[] and a TargetState, builds a toPath: PathNode[] */ + PathUtils.buildToPath = function (fromPath, targetState) { + var toPath = PathUtils.buildPath(targetState); + if (targetState.options().inherit) { + return PathUtils.inheritParams(fromPath, toPath, Object.keys(targetState.params())); + } + return toPath; + }; + /** + * Creates ViewConfig objects and adds to nodes. + * + * On each [[PathNode]], creates ViewConfig objects from the views: property of the node's state + */ + PathUtils.applyViewConfigs = function ($view, path, states) { + // Only apply the viewConfigs to the nodes for the given states + path.filter(function (node) { return inArray(states, node.state); }).forEach(function (node) { + var viewDecls = values(node.state.views || {}); + var subPath = PathUtils.subPath(path, function (n) { return n === node; }); + var viewConfigs = viewDecls.map(function (view) { return $view.createViewConfig(subPath, view); }); + node.views = viewConfigs.reduce(unnestR, []); + }); + }; + /** + * Given a fromPath and a toPath, returns a new to path which inherits parameters from the fromPath + * + * For a parameter in a node to be inherited from the from path: + * - The toPath's node must have a matching node in the fromPath (by state). + * - The parameter name must not be found in the toKeys parameter array. + * + * Note: the keys provided in toKeys are intended to be those param keys explicitly specified by some + * caller, for instance, $state.transitionTo(..., toParams). If a key was found in toParams, + * it is not inherited from the fromPath. + */ + PathUtils.inheritParams = function (fromPath, toPath, toKeys) { + if (toKeys === void 0) { toKeys = []; } + function nodeParamVals(path, state) { + var node = find(path, propEq('state', state)); + return extend({}, node && node.paramValues); + } + var noInherit = fromPath.map(function (node) { return node.paramSchema; }) + .reduce(unnestR, []) + .filter(function (param) { return !param.inherit; }) + .map(prop('id')); + /** + * Given an [[PathNode]] "toNode", return a new [[PathNode]] with param values inherited from the + * matching node in fromPath. Only inherit keys that aren't found in "toKeys" from the node in "fromPath"" + */ + function makeInheritedParamsNode(toNode) { + // All param values for the node (may include default key/vals, when key was not found in toParams) + var toParamVals = extend({}, toNode && toNode.paramValues); + // limited to only those keys found in toParams + var incomingParamVals = pick(toParamVals, toKeys); + toParamVals = omit(toParamVals, toKeys); + var fromParamVals = omit(nodeParamVals(fromPath, toNode.state) || {}, noInherit); + // extend toParamVals with any fromParamVals, then override any of those those with incomingParamVals + var ownParamVals = extend(toParamVals, fromParamVals, incomingParamVals); + return new PathNode(toNode.state).applyRawParams(ownParamVals); + } + // The param keys specified by the incoming toParams + return toPath.map(makeInheritedParamsNode); + }; + /** + * Computes the tree changes (entering, exiting) between a fromPath and toPath. + */ + PathUtils.treeChanges = function (fromPath, toPath, reloadState) { + var keep = 0, max = Math.min(fromPath.length, toPath.length); + var nodesMatch = function (node1, node2) { + return node1.equals(node2, PathUtils.nonDynamicParams); + }; + while (keep < max && fromPath[keep].state !== reloadState && nodesMatch(fromPath[keep], toPath[keep])) { + keep++; + } + /** Given a retained node, return a new node which uses the to node's param values */ + function applyToParams(retainedNode, idx) { + var cloned = PathNode.clone(retainedNode); + cloned.paramValues = toPath[idx].paramValues; + return cloned; + } + var from, retained, exiting, entering, to; + from = fromPath; + retained = from.slice(0, keep); + exiting = from.slice(keep); + // Create a new retained path (with shallow copies of nodes) which have the params of the toPath mapped + var retainedWithToParams = retained.map(applyToParams); + entering = toPath.slice(keep); + to = (retainedWithToParams).concat(entering); + return { from: from, to: to, retained: retained, exiting: exiting, entering: entering }; + }; + /** + * Returns a new path which is: the subpath of the first path which matches the second path. + * + * The new path starts from root and contains any nodes that match the nodes in the second path. + * It stops before the first non-matching node. + * + * Nodes are compared using their state property and their parameter values. + * If a `paramsFn` is provided, only the [[Param]] returned by the function will be considered when comparing nodes. + * + * @param pathA the first path + * @param pathB the second path + * @param paramsFn a function which returns the parameters to consider when comparing + * + * @returns an array of PathNodes from the first path which match the nodes in the second path + */ + PathUtils.matching = function (pathA, pathB, paramsFn) { + var done = false; + var tuples = arrayTuples(pathA, pathB); + return tuples.reduce(function (matching, _a) { + var nodeA = _a[0], nodeB = _a[1]; + done = done || !nodeA.equals(nodeB, paramsFn); + return done ? matching : matching.concat(nodeA); + }, []); + }; + /** + * Returns true if two paths are identical. + * + * @param pathA + * @param pathB + * @param paramsFn a function which returns the parameters to consider when comparing + * @returns true if the the states and parameter values for both paths are identical + */ + PathUtils.equals = function (pathA, pathB, paramsFn) { + return pathA.length === pathB.length && + PathUtils.matching(pathA, pathB, paramsFn).length === pathA.length; + }; + /** + * Return a subpath of a path, which stops at the first matching node + * + * Given an array of nodes, returns a subset of the array starting from the first node, + * stopping when the first node matches the predicate. + * + * @param path a path of [[PathNode]]s + * @param predicate a [[Predicate]] fn that matches [[PathNode]]s + * @returns a subpath up to the matching node, or undefined if no match is found + */ + PathUtils.subPath = function (path, predicate) { + var node = find(path, predicate); + var elementIdx = path.indexOf(node); + return elementIdx === -1 ? undefined : path.slice(0, elementIdx + 1); + }; + PathUtils.nonDynamicParams = function (node) { + return node.state.parameters({ inherit: false }) + .filter(function (param) { return !param.dynamic; }); + }; + /** Gets the raw parameter values from a path */ + PathUtils.paramValues = function (path) { + return path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {}); + }; + return PathUtils; +}()); + +/** + * @coreapi + * @module resolve + */ /** for typedoc */ +// TODO: explicitly make this user configurable +var defaultResolvePolicy = { + when: "LAZY", + async: "WAIT" +}; +/** + * The basic building block for the resolve system. + * + * Resolvables encapsulate a state's resolve's resolveFn, the resolveFn's declared dependencies, the wrapped (.promise), + * and the unwrapped-when-complete (.data) result of the resolveFn. + * + * Resolvable.get() either retrieves the Resolvable's existing promise, or else invokes resolve() (which invokes the + * resolveFn) and returns the resulting promise. + * + * Resolvable.get() and Resolvable.resolve() both execute within a context path, which is passed as the first + * parameter to those fns. + */ +var Resolvable = /** @class */ (function () { + function Resolvable(arg1, resolveFn, deps, policy, data) { + this.resolved = false; + this.promise = undefined; + if (arg1 instanceof Resolvable) { + extend(this, arg1); + } + else if (isFunction(resolveFn)) { + if (isNullOrUndefined(arg1)) + throw new Error("new Resolvable(): token argument is required"); + if (!isFunction(resolveFn)) + throw new Error("new Resolvable(): resolveFn argument must be a function"); + this.token = arg1; + this.policy = policy; + this.resolveFn = resolveFn; + this.deps = deps || []; + this.data = data; + this.resolved = data !== undefined; + this.promise = this.resolved ? services.$q.when(this.data) : undefined; + } + else if (isObject(arg1) && arg1.token && isFunction(arg1.resolveFn)) { + var literal = arg1; + return new Resolvable(literal.token, literal.resolveFn, literal.deps, literal.policy, literal.data); + } + } + Resolvable.prototype.getPolicy = function (state) { + var thisPolicy = this.policy || {}; + var statePolicy = state && state.resolvePolicy || {}; + return { + when: thisPolicy.when || statePolicy.when || defaultResolvePolicy.when, + async: thisPolicy.async || statePolicy.async || defaultResolvePolicy.async, + }; + }; + /** + * Asynchronously resolve this Resolvable's data + * + * Given a ResolveContext that this Resolvable is found in: + * Wait for this Resolvable's dependencies, then invoke this Resolvable's function + * and update the Resolvable's state + */ + Resolvable.prototype.resolve = function (resolveContext, trans) { + var _this = this; + var $q = services.$q; + // Gets all dependencies from ResolveContext and wait for them to be resolved + var getResolvableDependencies = function () { + return $q.all(resolveContext.getDependencies(_this).map(function (resolvable) { + return resolvable.get(resolveContext, trans); + })); + }; + // Invokes the resolve function passing the resolved dependencies as arguments + var invokeResolveFn = function (resolvedDeps) { + return _this.resolveFn.apply(null, resolvedDeps); + }; + /** + * For RXWAIT policy: + * + * Given an observable returned from a resolve function: + * - enables .cache() mode (this allows multicast subscribers) + * - then calls toPromise() (this triggers subscribe() and thus fetches) + * - Waits for the promise, then return the cached observable (not the first emitted value). + */ + var waitForRx = function (observable$) { + var cached = observable$.cache(1); + return cached.take(1).toPromise().then(function () { return cached; }); + }; + // If the resolve policy is RXWAIT, wait for the observable to emit something. otherwise pass through. + var node = resolveContext.findNode(this); + var state = node && node.state; + var maybeWaitForRx = this.getPolicy(state).async === "RXWAIT" ? waitForRx : identity; + // After the final value has been resolved, update the state of the Resolvable + var applyResolvedValue = function (resolvedValue) { + _this.data = resolvedValue; + _this.resolved = true; + trace.traceResolvableResolved(_this, trans); + return _this.data; + }; + // Sets the promise property first, then getsResolvableDependencies in the context of the promise chain. Always waits one tick. + return this.promise = $q.when() + .then(getResolvableDependencies) + .then(invokeResolveFn) + .then(maybeWaitForRx) + .then(applyResolvedValue); + }; + /** + * Gets a promise for this Resolvable's data. + * + * Fetches the data and returns a promise. + * Returns the existing promise if it has already been fetched once. + */ + Resolvable.prototype.get = function (resolveContext, trans) { + return this.promise || this.resolve(resolveContext, trans); + }; + Resolvable.prototype.toString = function () { + return "Resolvable(token: " + stringify(this.token) + ", requires: [" + this.deps.map(stringify) + "])"; + }; + Resolvable.prototype.clone = function () { + return new Resolvable(this); + }; + Resolvable.fromData = function (token, data) { + return new Resolvable(token, function () { return data; }, null, null, data); + }; + return Resolvable; +}()); + +/** @internalapi */ +var resolvePolicies = { + when: { + LAZY: "LAZY", + EAGER: "EAGER" + }, + async: { + WAIT: "WAIT", + NOWAIT: "NOWAIT", + RXWAIT: "RXWAIT" + } +}; + +/** @module resolve */ +/** for typedoc */ +var whens = resolvePolicies.when; +var ALL_WHENS = [whens.EAGER, whens.LAZY]; +var EAGER_WHENS = [whens.EAGER]; +var NATIVE_INJECTOR_TOKEN = "Native Injector"; +/** + * Encapsulates Dependency Injection for a path of nodes + * + * UI-Router states are organized as a tree. + * A nested state has a path of ancestors to the root of the tree. + * When a state is being activated, each element in the path is wrapped as a [[PathNode]]. + * A `PathNode` is a stateful object that holds things like parameters and resolvables for the state being activated. + * + * The ResolveContext closes over the [[PathNode]]s, and provides DI for the last node in the path. + */ +var ResolveContext = /** @class */ (function () { + function ResolveContext(_path) { + this._path = _path; + } + /** Gets all the tokens found in the resolve context, de-duplicated */ + ResolveContext.prototype.getTokens = function () { + return this._path.reduce(function (acc, node) { return acc.concat(node.resolvables.map(function (r) { return r.token; })); }, []).reduce(uniqR, []); + }; + /** + * Gets the Resolvable that matches the token + * + * Gets the last Resolvable that matches the token in this context, or undefined. + * Throws an error if it doesn't exist in the ResolveContext + */ + ResolveContext.prototype.getResolvable = function (token) { + var matching = this._path.map(function (node) { return node.resolvables; }) + .reduce(unnestR, []) + .filter(function (r) { return r.token === token; }); + return tail(matching); + }; + /** Returns the [[ResolvePolicy]] for the given [[Resolvable]] */ + ResolveContext.prototype.getPolicy = function (resolvable) { + var node = this.findNode(resolvable); + return resolvable.getPolicy(node.state); + }; + /** + * Returns a ResolveContext that includes a portion of this one + * + * Given a state, this method creates a new ResolveContext from this one. + * The new context starts at the first node (root) and stops at the node for the `state` parameter. + * + * #### Why + * + * When a transition is created, the nodes in the "To Path" are injected from a ResolveContext. + * A ResolveContext closes over a path of [[PathNode]]s and processes the resolvables. + * The "To State" can inject values from its own resolvables, as well as those from all its ancestor state's (node's). + * This method is used to create a narrower context when injecting ancestor nodes. + * + * @example + * `let ABCD = new ResolveContext([A, B, C, D]);` + * + * Given a path `[A, B, C, D]`, where `A`, `B`, `C` and `D` are nodes for states `a`, `b`, `c`, `d`: + * When injecting `D`, `D` should have access to all resolvables from `A`, `B`, `C`, `D`. + * However, `B` should only be able to access resolvables from `A`, `B`. + * + * When resolving for the `B` node, first take the full "To Path" Context `[A,B,C,D]` and limit to the subpath `[A,B]`. + * `let AB = ABCD.subcontext(a)` + */ + ResolveContext.prototype.subContext = function (state) { + return new ResolveContext(PathUtils.subPath(this._path, function (node) { return node.state === state; })); + }; + /** + * Adds Resolvables to the node that matches the state + * + * This adds a [[Resolvable]] (generally one created on the fly; not declared on a [[StateDeclaration.resolve]] block). + * The resolvable is added to the node matching the `state` parameter. + * + * These new resolvables are not automatically fetched. + * The calling code should either fetch them, fetch something that depends on them, + * or rely on [[resolvePath]] being called when some state is being entered. + * + * Note: each resolvable's [[ResolvePolicy]] is merged with the state's policy, and the global default. + * + * @param newResolvables the new Resolvables + * @param state Used to find the node to put the resolvable on + */ + ResolveContext.prototype.addResolvables = function (newResolvables, state) { + var node = find(this._path, propEq('state', state)); + var keys = newResolvables.map(function (r) { return r.token; }); + node.resolvables = node.resolvables.filter(function (r) { return keys.indexOf(r.token) === -1; }).concat(newResolvables); + }; + /** + * Returns a promise for an array of resolved path Element promises + * + * @param when + * @param trans + * @returns {Promise|any} + */ + ResolveContext.prototype.resolvePath = function (when, trans) { + var _this = this; + if (when === void 0) { when = "LAZY"; } + // This option determines which 'when' policy Resolvables we are about to fetch. + var whenOption = inArray(ALL_WHENS, when) ? when : "LAZY"; + // If the caller specified EAGER, only the EAGER Resolvables are fetched. + // if the caller specified LAZY, both EAGER and LAZY Resolvables are fetched.` + var matchedWhens = whenOption === resolvePolicies.when.EAGER ? EAGER_WHENS : ALL_WHENS; + // get the subpath to the state argument, if provided + trace.traceResolvePath(this._path, when, trans); + var matchesPolicy = function (acceptedVals, whenOrAsync) { + return function (resolvable) { + return inArray(acceptedVals, _this.getPolicy(resolvable)[whenOrAsync]); + }; + }; + // Trigger all the (matching) Resolvables in the path + // Reduce all the "WAIT" Resolvables into an array + var promises = this._path.reduce(function (acc, node) { + var nodeResolvables = node.resolvables.filter(matchesPolicy(matchedWhens, 'when')); + var nowait = nodeResolvables.filter(matchesPolicy(['NOWAIT'], 'async')); + var wait = nodeResolvables.filter(not(matchesPolicy(['NOWAIT'], 'async'))); + // For the matching Resolvables, start their async fetch process. + var subContext = _this.subContext(node.state); + var getResult = function (r) { return r.get(subContext, trans) + .then(function (value) { return ({ token: r.token, value: value }); }); }; + nowait.forEach(getResult); + return acc.concat(wait.map(getResult)); + }, []); + // Wait for all the "WAIT" resolvables + return services.$q.all(promises); + }; + ResolveContext.prototype.injector = function () { + return this._injector || (this._injector = new UIInjectorImpl(this)); + }; + ResolveContext.prototype.findNode = function (resolvable) { + return find(this._path, function (node) { return inArray(node.resolvables, resolvable); }); + }; + /** + * Gets the async dependencies of a Resolvable + * + * Given a Resolvable, returns its dependencies as a Resolvable[] + */ + ResolveContext.prototype.getDependencies = function (resolvable) { + var _this = this; + var node = this.findNode(resolvable); + // Find which other resolvables are "visible" to the `resolvable` argument + // subpath stopping at resolvable's node, or the whole path (if the resolvable isn't in the path) + var subPath = PathUtils.subPath(this._path, function (x) { return x === node; }) || this._path; + var availableResolvables = subPath + .reduce(function (acc, _node) { return acc.concat(_node.resolvables); }, []) //all of subpath's resolvables + .filter(function (res) { return res !== resolvable; }); // filter out the `resolvable` argument + var getDependency = function (token) { + var matching = availableResolvables.filter(function (r) { return r.token === token; }); + if (matching.length) + return tail(matching); + var fromInjector = _this.injector().getNative(token); + if (isUndefined(fromInjector)) { + throw new Error("Could not find Dependency Injection token: " + stringify(token)); + } + return new Resolvable(token, function () { return fromInjector; }, [], fromInjector); + }; + return resolvable.deps.map(getDependency); + }; + return ResolveContext; +}()); +var UIInjectorImpl = /** @class */ (function () { + function UIInjectorImpl(context) { + this.context = context; + this.native = this.get(NATIVE_INJECTOR_TOKEN) || services.$injector; + } + UIInjectorImpl.prototype.get = function (token) { + var resolvable = this.context.getResolvable(token); + if (resolvable) { + if (this.context.getPolicy(resolvable).async === 'NOWAIT') { + return resolvable.get(this.context); + } + if (!resolvable.resolved) { + throw new Error("Resolvable async .get() not complete:" + stringify(resolvable.token)); + } + return resolvable.data; + } + return this.getNative(token); + }; + UIInjectorImpl.prototype.getAsync = function (token) { + var resolvable = this.context.getResolvable(token); + if (resolvable) + return resolvable.get(this.context); + return services.$q.when(this.native.get(token)); + }; + UIInjectorImpl.prototype.getNative = function (token) { + return this.native && this.native.get(token); + }; + return UIInjectorImpl; +}()); + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +/** @hidden */ +var stateSelf = prop("self"); +/** + * Represents a transition between two states. + * + * When navigating to a state, we are transitioning **from** the current state **to** the new state. + * + * This object contains all contextual information about the to/from states, parameters, resolves. + * It has information about all states being entered and exited as a result of the transition. + */ +var Transition = /** @class */ (function () { + /** + * Creates a new Transition object. + * + * If the target state is not valid, an error is thrown. + * + * @internalapi + * + * @param fromPath The path of [[PathNode]]s from which the transition is leaving. The last node in the `fromPath` + * encapsulates the "from state". + * @param targetState The target state and parameters being transitioned to (also, the transition options) + * @param router The [[UIRouter]] instance + */ + function Transition(fromPath, targetState, router) { + var _this = this; + /** @hidden */ + this._deferred = services.$q.defer(); + /** + * This promise is resolved or rejected based on the outcome of the Transition. + * + * When the transition is successful, the promise is resolved + * When the transition is unsuccessful, the promise is rejected with the [[Rejection]] or javascript error + */ + this.promise = this._deferred.promise; + /** @hidden Holds the hook registration functions such as those passed to Transition.onStart() */ + this._registeredHooks = {}; + /** @hidden */ + this._hookBuilder = new HookBuilder(this); + /** Checks if this transition is currently active/running. */ + this.isActive = function () { + return _this.router.globals.transition === _this; + }; + this.router = router; + this._targetState = targetState; + if (!targetState.valid()) { + throw new Error(targetState.error()); + } + // current() is assumed to come from targetState.options, but provide a naive implementation otherwise. + this._options = extend({ current: val(this) }, targetState.options()); + this.$id = router.transitionService._transitionCount++; + var toPath = PathUtils.buildToPath(fromPath, targetState); + this._treeChanges = PathUtils.treeChanges(fromPath, toPath, this._options.reloadState); + this.createTransitionHookRegFns(); + var onCreateHooks = this._hookBuilder.buildHooksForPhase(exports.TransitionHookPhase.CREATE); + TransitionHook.invokeHooks(onCreateHooks, function () { return null; }); + this.applyViewConfigs(router); + } + /** @hidden */ + Transition.prototype.onBefore = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onStart = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onExit = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onRetain = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onEnter = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onFinish = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onSuccess = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onError = function (criteria, callback, options) { return; }; + /** @hidden + * Creates the transition-level hook registration functions + * (which can then be used to register hooks) + */ + Transition.prototype.createTransitionHookRegFns = function () { + var _this = this; + this.router.transitionService._pluginapi._getEvents() + .filter(function (type) { return type.hookPhase !== exports.TransitionHookPhase.CREATE; }) + .forEach(function (type) { return makeEvent(_this, _this.router.transitionService, type); }); + }; + /** @internalapi */ + Transition.prototype.getHooks = function (hookName) { + return this._registeredHooks[hookName]; + }; + Transition.prototype.applyViewConfigs = function (router) { + var enteringStates = this._treeChanges.entering.map(function (node) { return node.state; }); + PathUtils.applyViewConfigs(router.transitionService.$view, this._treeChanges.to, enteringStates); + }; + /** + * @internalapi + * + * @returns the internal from [State] object + */ + Transition.prototype.$from = function () { + return tail(this._treeChanges.from).state; + }; + /** + * @internalapi + * + * @returns the internal to [State] object + */ + Transition.prototype.$to = function () { + return tail(this._treeChanges.to).state; + }; + /** + * Returns the "from state" + * + * Returns the state that the transition is coming *from*. + * + * @returns The state declaration object for the Transition's ("from state"). + */ + Transition.prototype.from = function () { + return this.$from().self; + }; + /** + * Returns the "to state" + * + * Returns the state that the transition is going *to*. + * + * @returns The state declaration object for the Transition's target state ("to state"). + */ + Transition.prototype.to = function () { + return this.$to().self; + }; + /** + * Gets the Target State + * + * A transition's [[TargetState]] encapsulates the [[to]] state, the [[params]], and the [[options]] as a single object. + * + * @returns the [[TargetState]] of this Transition + */ + Transition.prototype.targetState = function () { + return this._targetState; + }; + /** + * Determines whether two transitions are equivalent. + * @deprecated + */ + Transition.prototype.is = function (compare) { + if (compare instanceof Transition) { + // TODO: Also compare parameters + return this.is({ to: compare.$to().name, from: compare.$from().name }); + } + return !((compare.to && !matchState(this.$to(), compare.to)) || + (compare.from && !matchState(this.$from(), compare.from))); + }; + Transition.prototype.params = function (pathname) { + if (pathname === void 0) { pathname = "to"; } + return Object.freeze(this._treeChanges[pathname].map(prop("paramValues")).reduce(mergeR, {})); + }; + /** + * Creates a [[UIInjector]] Dependency Injector + * + * Returns a Dependency Injector for the Transition's target state (to state). + * The injector provides resolve values which the target state has access to. + * + * The `UIInjector` can also provide values from the native root/global injector (ng1/ng2). + * + * #### Example: + * ```js + * .onEnter({ entering: 'myState' }, trans => { + * var myResolveValue = trans.injector().get('myResolve'); + * // Inject a global service from the global/native injector (if it exists) + * var MyService = trans.injector().get('MyService'); + * }) + * ``` + * + * In some cases (such as `onBefore`), you may need access to some resolve data but it has not yet been fetched. + * You can use [[UIInjector.getAsync]] to get a promise for the data. + * #### Example: + * ```js + * .onBefore({}, trans => { + * return trans.injector().getAsync('myResolve').then(myResolveValue => + * return myResolveValue !== 'ABORT'; + * }); + * }); + * ``` + * + * If a `state` is provided, the injector that is returned will be limited to resolve values that the provided state has access to. + * This can be useful if both a parent state `foo` and a child state `foo.bar` have both defined a resolve such as `data`. + * #### Example: + * ```js + * .onEnter({ to: 'foo.bar' }, trans => { + * // returns result of `foo` state's `data` resolve + * // even though `foo.bar` also has a `data` resolve + * var fooData = trans.injector('foo').get('data'); + * }); + * ``` + * + * If you need resolve data from the exiting states, pass `'from'` as `pathName`. + * The resolve data from the `from` path will be returned. + * #### Example: + * ```js + * .onExit({ exiting: 'foo.bar' }, trans => { + * // Gets the resolve value of `data` from the exiting state. + * var fooData = trans.injector(null, 'foo.bar').get('data'); + * }); + * ``` + * + * + * @param state Limits the resolves provided to only the resolves the provided state has access to. + * @param pathName Default: `'to'`: Chooses the path for which to create the injector. Use this to access resolves for `exiting` states. + * + * @returns a [[UIInjector]] + */ + Transition.prototype.injector = function (state, pathName) { + if (pathName === void 0) { pathName = "to"; } + var path = this._treeChanges[pathName]; + if (state) + path = PathUtils.subPath(path, function (node) { return node.state === state || node.state.name === state; }); + return new ResolveContext(path).injector(); + }; + /** + * Gets all available resolve tokens (keys) + * + * This method can be used in conjunction with [[injector]] to inspect the resolve values + * available to the Transition. + * + * This returns all the tokens defined on [[StateDeclaration.resolve]] blocks, for the states + * in the Transition's [[TreeChanges.to]] path. + * + * #### Example: + * This example logs all resolve values + * ```js + * let tokens = trans.getResolveTokens(); + * tokens.forEach(token => console.log(token + " = " + trans.injector().get(token))); + * ``` + * + * #### Example: + * This example creates promises for each resolve value. + * This triggers fetches of resolves (if any have not yet been fetched). + * When all promises have all settled, it logs the resolve values. + * ```js + * let tokens = trans.getResolveTokens(); + * let promise = tokens.map(token => trans.injector().getAsync(token)); + * Promise.all(promises).then(values => console.log("Resolved values: " + values)); + * ``` + * + * Note: Angular 1 users whould use `$q.all()` + * + * @param pathname resolve context's path name (e.g., `to` or `from`) + * + * @returns an array of resolve tokens (keys) + */ + Transition.prototype.getResolveTokens = function (pathname) { + if (pathname === void 0) { pathname = "to"; } + return new ResolveContext(this._treeChanges[pathname]).getTokens(); + }; + /** + * Dynamically adds a new [[Resolvable]] (i.e., [[StateDeclaration.resolve]]) to this transition. + * + * #### Example: + * ```js + * transitionService.onBefore({}, transition => { + * transition.addResolvable({ + * token: 'myResolve', + * deps: ['MyService'], + * resolveFn: myService => myService.getData() + * }); + * }); + * ``` + * + * @param resolvable a [[ResolvableLiteral]] object (or a [[Resolvable]]) + * @param state the state in the "to path" which should receive the new resolve (otherwise, the root state) + */ + Transition.prototype.addResolvable = function (resolvable, state) { + if (state === void 0) { state = ""; } + resolvable = is(Resolvable)(resolvable) ? resolvable : new Resolvable(resolvable); + var stateName = (typeof state === "string") ? state : state.name; + var topath = this._treeChanges.to; + var targetNode = find(topath, function (node) { return node.state.name === stateName; }); + var resolveContext = new ResolveContext(topath); + resolveContext.addResolvables([resolvable], targetNode.state); + }; + /** + * Gets the transition from which this transition was redirected. + * + * If the current transition is a redirect, this method returns the transition that was redirected. + * + * #### Example: + * ```js + * let transitionA = $state.go('A').transition + * transitionA.onStart({}, () => $state.target('B')); + * $transitions.onSuccess({ to: 'B' }, (trans) => { + * trans.to().name === 'B'; // true + * trans.redirectedFrom() === transitionA; // true + * }); + * ``` + * + * @returns The previous Transition, or null if this Transition is not the result of a redirection + */ + Transition.prototype.redirectedFrom = function () { + return this._options.redirectedFrom || null; + }; + /** + * Gets the original transition in a redirect chain + * + * A transition might belong to a long chain of multiple redirects. + * This method walks the [[redirectedFrom]] chain back to the original (first) transition in the chain. + * + * #### Example: + * ```js + * // states + * registry.register({ name: 'A', redirectTo: 'B' }); + * registry.register({ name: 'B', redirectTo: 'C' }); + * registry.register({ name: 'C', redirectTo: 'D' }); + * registry.register({ name: 'D' }); + * + * let transitionA = $state.go('A').transition + * + * $transitions.onSuccess({ to: 'D' }, (trans) => { + * trans.to().name === 'D'; // true + * trans.redirectedFrom().to().name === 'C'; // true + * trans.originalTransition() === transitionA; // true + * trans.originalTransition().to().name === 'A'; // true + * }); + * ``` + * + * @returns The original Transition that started a redirect chain + */ + Transition.prototype.originalTransition = function () { + var rf = this.redirectedFrom(); + return (rf && rf.originalTransition()) || this; + }; + /** + * Get the transition options + * + * @returns the options for this Transition. + */ + Transition.prototype.options = function () { + return this._options; + }; + /** + * Gets the states being entered. + * + * @returns an array of states that will be entered during this transition. + */ + Transition.prototype.entering = function () { + return map(this._treeChanges.entering, prop('state')).map(stateSelf); + }; + /** + * Gets the states being exited. + * + * @returns an array of states that will be exited during this transition. + */ + Transition.prototype.exiting = function () { + return map(this._treeChanges.exiting, prop('state')).map(stateSelf).reverse(); + }; + /** + * Gets the states being retained. + * + * @returns an array of states that are already entered from a previous Transition, that will not be + * exited during this Transition + */ + Transition.prototype.retained = function () { + return map(this._treeChanges.retained, prop('state')).map(stateSelf); + }; + /** + * Get the [[ViewConfig]]s associated with this Transition + * + * Each state can define one or more views (template/controller), which are encapsulated as `ViewConfig` objects. + * This method fetches the `ViewConfigs` for a given path in the Transition (e.g., "to" or "entering"). + * + * @param pathname the name of the path to fetch views for: + * (`'to'`, `'from'`, `'entering'`, `'exiting'`, `'retained'`) + * @param state If provided, only returns the `ViewConfig`s for a single state in the path + * + * @returns a list of ViewConfig objects for the given path. + */ + Transition.prototype.views = function (pathname, state) { + if (pathname === void 0) { pathname = "entering"; } + var path = this._treeChanges[pathname]; + path = !state ? path : path.filter(propEq('state', state)); + return path.map(prop("views")).filter(identity).reduce(unnestR, []); + }; + Transition.prototype.treeChanges = function (pathname) { + return pathname ? this._treeChanges[pathname] : this._treeChanges; + }; + /** + * Creates a new transition that is a redirection of the current one. + * + * This transition can be returned from a [[TransitionService]] hook to + * redirect a transition to a new state and/or set of parameters. + * + * @internalapi + * + * @returns Returns a new [[Transition]] instance. + */ + Transition.prototype.redirect = function (targetState) { + var redirects = 1, trans = this; + while ((trans = trans.redirectedFrom()) != null) { + if (++redirects > 20) + throw new Error("Too many consecutive Transition redirects (20+)"); + } + var redirectOpts = { redirectedFrom: this, source: "redirect" }; + // If the original transition was caused by URL sync, then use { location: 'replace' } + // on the new transition (unless the target state explicitly specifies location: false). + // This causes the original url to be replaced with the url for the redirect target + // so the original url disappears from the browser history. + if (this.options().source === 'url' && targetState.options().location !== false) { + redirectOpts.location = 'replace'; + } + var newOptions = extend({}, this.options(), targetState.options(), redirectOpts); + targetState = targetState.withOptions(newOptions, true); + var newTransition = this.router.transitionService.create(this._treeChanges.from, targetState); + var originalEnteringNodes = this._treeChanges.entering; + var redirectEnteringNodes = newTransition._treeChanges.entering; + // --- Re-use resolve data from original transition --- + // When redirecting from a parent state to a child state where the parent parameter values haven't changed + // (because of the redirect), the resolves fetched by the original transition are still valid in the + // redirected transition. + // + // This allows you to define a redirect on a parent state which depends on an async resolve value. + // You can wait for the resolve, then redirect to a child state based on the result. + // The redirected transition does not have to re-fetch the resolve. + // --------------------------------------------------------- + var nodeIsReloading = function (reloadState) { return function (node) { + return reloadState && node.state.includes[reloadState.name]; + }; }; + // Find any "entering" nodes in the redirect path that match the original path and aren't being reloaded + var matchingEnteringNodes = PathUtils.matching(redirectEnteringNodes, originalEnteringNodes, PathUtils.nonDynamicParams) + .filter(not(nodeIsReloading(targetState.options().reloadState))); + // Use the existing (possibly pre-resolved) resolvables for the matching entering nodes. + matchingEnteringNodes.forEach(function (node, idx) { + node.resolvables = originalEnteringNodes[idx].resolvables; + }); + return newTransition; + }; + /** @hidden If a transition doesn't exit/enter any states, returns any [[Param]] whose value changed */ + Transition.prototype._changedParams = function () { + var tc = this._treeChanges; + /** Return undefined if it's not a "dynamic" transition, for the following reasons */ + // If user explicitly wants a reload + if (this._options.reload) + return undefined; + // If any states are exiting or entering + if (tc.exiting.length || tc.entering.length) + return undefined; + // If to/from path lengths differ + if (tc.to.length !== tc.from.length) + return undefined; + // If the to/from paths are different + var pathsDiffer = arrayTuples(tc.to, tc.from) + .map(function (tuple) { return tuple[0].state !== tuple[1].state; }) + .reduce(anyTrueR, false); + if (pathsDiffer) + return undefined; + // Find any parameter values that differ + var nodeSchemas = tc.to.map(function (node) { return node.paramSchema; }); + var _a = [tc.to, tc.from].map(function (path) { return path.map(function (x) { return x.paramValues; }); }), toValues = _a[0], fromValues = _a[1]; + var tuples = arrayTuples(nodeSchemas, toValues, fromValues); + return tuples.map(function (_a) { + var schema = _a[0], toVals = _a[1], fromVals = _a[2]; + return Param.changed(schema, toVals, fromVals); + }).reduce(unnestR, []); + }; + /** + * Returns true if the transition is dynamic. + * + * A transition is dynamic if no states are entered nor exited, but at least one dynamic parameter has changed. + * + * @returns true if the Transition is dynamic + */ + Transition.prototype.dynamic = function () { + var changes = this._changedParams(); + return !changes ? false : changes.map(function (x) { return x.dynamic; }).reduce(anyTrueR, false); + }; + /** + * Returns true if the transition is ignored. + * + * A transition is ignored if no states are entered nor exited, and no parameter values have changed. + * + * @returns true if the Transition is ignored. + */ + Transition.prototype.ignored = function () { + return !!this._ignoredReason(); + }; + /** @hidden */ + Transition.prototype._ignoredReason = function () { + var pending = this.router.globals.transition; + var reloadState = this._options.reloadState; + var same = function (pathA, pathB) { + if (pathA.length !== pathB.length) + return false; + var matching = PathUtils.matching(pathA, pathB); + return pathA.length === matching.filter(function (node) { return !reloadState || !node.state.includes[reloadState.name]; }).length; + }; + var newTC = this.treeChanges(); + var pendTC = pending && pending.treeChanges(); + if (pendTC && same(pendTC.to, newTC.to) && same(pendTC.exiting, newTC.exiting)) + return "SameAsPending"; + if (newTC.exiting.length === 0 && newTC.entering.length === 0 && same(newTC.from, newTC.to)) + return "SameAsCurrent"; + }; + /** + * Runs the transition + * + * This method is generally called from the [[StateService.transitionTo]] + * + * @internalapi + * + * @returns a promise for a successful transition. + */ + Transition.prototype.run = function () { + var _this = this; + var runAllHooks = TransitionHook.runAllHooks; + // Gets transition hooks array for the given phase + var getHooksFor = function (phase) { + return _this._hookBuilder.buildHooksForPhase(phase); + }; + // When the chain is complete, then resolve or reject the deferred + var transitionSuccess = function () { + trace.traceSuccess(_this.$to(), _this); + _this.success = true; + _this._deferred.resolve(_this.to()); + runAllHooks(getHooksFor(exports.TransitionHookPhase.SUCCESS)); + }; + var transitionError = function (reason) { + trace.traceError(reason, _this); + _this.success = false; + _this._deferred.reject(reason); + _this._error = reason; + runAllHooks(getHooksFor(exports.TransitionHookPhase.ERROR)); + }; + var runTransition = function () { + // Wait to build the RUN hook chain until the BEFORE hooks are done + // This allows a BEFORE hook to dynamically add additional RUN hooks via the Transition object. + var allRunHooks = getHooksFor(exports.TransitionHookPhase.RUN); + var done = function () { return services.$q.when(undefined); }; + return TransitionHook.invokeHooks(allRunHooks, done); + }; + var startTransition = function () { + var globals = _this.router.globals; + globals.lastStartedTransitionId = _this.$id; + globals.transition = _this; + globals.transitionHistory.enqueue(_this); + trace.traceTransitionStart(_this); + return services.$q.when(undefined); + }; + var allBeforeHooks = getHooksFor(exports.TransitionHookPhase.BEFORE); + TransitionHook.invokeHooks(allBeforeHooks, startTransition) + .then(runTransition) + .then(transitionSuccess, transitionError); + return this.promise; + }; + /** + * Checks if the Transition is valid + * + * @returns true if the Transition is valid + */ + Transition.prototype.valid = function () { + return !this.error() || this.success !== undefined; + }; + /** + * Aborts this transition + * + * Imperative API to abort a Transition. + * This only applies to Transitions that are not yet complete. + */ + Transition.prototype.abort = function () { + // Do not set flag if the transition is already complete + if (isUndefined(this.success)) { + this._aborted = true; + } + }; + /** + * The Transition error reason. + * + * If the transition is invalid (and could not be run), returns the reason the transition is invalid. + * If the transition was valid and ran, but was not successful, returns the reason the transition failed. + * + * @returns an error message explaining why the transition is invalid, or the reason the transition failed. + */ + Transition.prototype.error = function () { + var state = this.$to(); + if (state.self.abstract) + return "Cannot transition to abstract state '" + state.name + "'"; + var paramDefs = state.parameters(), values$$1 = this.params(); + var invalidParams = paramDefs.filter(function (param) { return !param.validates(values$$1[param.id]); }); + if (invalidParams.length) { + return "Param values not valid for state '" + state.name + "'. Invalid params: [ " + invalidParams.map(function (param) { return param.id; }).join(', ') + " ]"; + } + if (this.success === false) + return this._error; + }; + /** + * A string representation of the Transition + * + * @returns A string representation of the Transition + */ + Transition.prototype.toString = function () { + var fromStateOrName = this.from(); + var toStateOrName = this.to(); + var avoidEmptyHash = function (params) { + return (params["#"] !== null && params["#"] !== undefined) ? params : omit(params, ["#"]); + }; + // (X) means the to state is invalid. + var id = this.$id, from = isObject(fromStateOrName) ? fromStateOrName.name : fromStateOrName, fromParams = stringify(avoidEmptyHash(this._treeChanges.from.map(prop('paramValues')).reduce(mergeR, {}))), toValid = this.valid() ? "" : "(X) ", to = isObject(toStateOrName) ? toStateOrName.name : toStateOrName, toParams = stringify(avoidEmptyHash(this.params())); + return "Transition#" + id + "( '" + from + "'" + fromParams + " -> " + toValid + "'" + to + "'" + toParams + " )"; + }; + /** @hidden */ + Transition.diToken = Transition; + return Transition; +}()); + +/** + * Functions that manipulate strings + * + * Although these functions are exported, they are subject to change without notice. + * + * @module common_strings + */ /** */ +/** + * Returns a string shortened to a maximum length + * + * If the string is already less than the `max` length, return the string. + * Else return the string, shortened to `max - 3` and append three dots ("..."). + * + * @param max the maximum length of the string to return + * @param str the input string + */ +function maxLength(max, str) { + if (str.length <= max) + return str; + return str.substr(0, max - 3) + "..."; +} +/** + * Returns a string, with spaces added to the end, up to a desired str length + * + * If the string is already longer than the desired length, return the string. + * Else returns the string, with extra spaces on the end, such that it reaches `length` characters. + * + * @param length the desired length of the string to return + * @param str the input string + */ +function padString(length, str) { + while (str.length < length) + str += " "; + return str; +} +function kebobString(camelCase) { + return camelCase + .replace(/^([A-Z])/, function ($1) { return $1.toLowerCase(); }) // replace first char + .replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); }); // replace rest +} +function functionToString(fn) { + var fnStr = fnToString(fn); + var namedFunctionMatch = fnStr.match(/^(function [^ ]+\([^)]*\))/); + var toStr = namedFunctionMatch ? namedFunctionMatch[1] : fnStr; + var fnName = fn['name'] || ""; + if (fnName && toStr.match(/function \(/)) { + return 'function ' + fnName + toStr.substr(9); + } + return toStr; +} +function fnToString(fn) { + var _fn = isArray(fn) ? fn.slice(-1)[0] : fn; + return _fn && _fn.toString() || "undefined"; +} +var stringifyPatternFn = null; +var stringifyPattern = function (value) { + var isRejection = Rejection.isRejectionPromise; + stringifyPatternFn = stringifyPatternFn || pattern([ + [not(isDefined), val("undefined")], + [isNull, val("null")], + [isPromise, val("[Promise]")], + [isRejection, function (x) { return x._transitionRejection.toString(); }], + [is(Rejection), invoke("toString")], + [is(Transition), invoke("toString")], + [is(Resolvable), invoke("toString")], + [isInjectable, functionToString], + [val(true), identity] + ]); + return stringifyPatternFn(value); +}; +function stringify(o) { + var seen = []; + function format(val$$1) { + if (isObject(val$$1)) { + if (seen.indexOf(val$$1) !== -1) + return '[circular ref]'; + seen.push(val$$1); + } + return stringifyPattern(val$$1); + } + return JSON.stringify(o, function (key, val$$1) { return format(val$$1); }).replace(/\\"/g, '"'); +} +/** Returns a function that splits a string on a character or substring */ +var beforeAfterSubstr = function (char) { return function (str) { + if (!str) + return ["", ""]; + var idx = str.indexOf(char); + if (idx === -1) + return [str, ""]; + return [str.substr(0, idx), str.substr(idx + 1)]; +}; }; +var hostRegex = new RegExp('^(?:[a-z]+:)?//[^/]+/'); +var stripFile = function (str) { return str.replace(/\/[^/]*$/, ''); }; +var splitHash = beforeAfterSubstr("#"); +var splitQuery = beforeAfterSubstr("?"); +var splitEqual = beforeAfterSubstr("="); +var trimHashVal = function (str) { return str ? str.replace(/^#/, "") : ""; }; +/** + * Splits on a delimiter, but returns the delimiters in the array + * + * #### Example: + * ```js + * var splitOnSlashes = splitOnDelim('/'); + * splitOnSlashes("/foo"); // ["/", "foo"] + * splitOnSlashes("/foo/"); // ["/", "foo", "/"] + * ``` + */ +function splitOnDelim(delim) { + var re = new RegExp("(" + delim + ")", "g"); + return function (str) { + return str.split(re).filter(identity); + }; +} + +/** + * Reduce fn that joins neighboring strings + * + * Given an array of strings, returns a new array + * where all neighboring strings have been joined. + * + * #### Example: + * ```js + * let arr = ["foo", "bar", 1, "baz", "", "qux" ]; + * arr.reduce(joinNeighborsR, []) // ["foobar", 1, "bazqux" ] + * ``` + */ +function joinNeighborsR(acc, x) { + if (isString(tail(acc)) && isString(x)) + return acc.slice(0, -1).concat(tail(acc) + x); + return pushR(acc, x); +} + +/** @module common */ /** for typedoc */ + +/** + * @coreapi + * @module params + */ +/** */ +/** + * A registry for parameter types. + * + * This registry manages the built-in (and custom) parameter types. + * + * The built-in parameter types are: + * + * - [[string]] + * - [[path]] + * - [[query]] + * - [[hash]] + * - [[int]] + * - [[bool]] + * - [[date]] + * - [[json]] + * - [[any]] + */ +var ParamTypes = /** @class */ (function () { + /** @internalapi */ + function ParamTypes() { + /** @hidden */ + this.enqueue = true; + /** @hidden */ + this.typeQueue = []; + /** @internalapi */ + this.defaultTypes = pick(ParamTypes.prototype, ["hash", "string", "query", "path", "int", "bool", "date", "json", "any"]); + // Register default types. Store them in the prototype of this.types. + var makeType = function (definition, name) { + return new ParamType(extend({ name: name }, definition)); + }; + this.types = inherit(map(this.defaultTypes, makeType), {}); + } + /** @internalapi */ + ParamTypes.prototype.dispose = function () { + this.types = {}; + }; + /** + * Registers a parameter type + * + * End users should call [[UrlMatcherFactory.type]], which delegates to this method. + */ + ParamTypes.prototype.type = function (name, definition, definitionFn) { + if (!isDefined(definition)) + return this.types[name]; + if (this.types.hasOwnProperty(name)) + throw new Error("A type named '" + name + "' has already been defined."); + this.types[name] = new ParamType(extend({ name: name }, definition)); + if (definitionFn) { + this.typeQueue.push({ name: name, def: definitionFn }); + if (!this.enqueue) + this._flushTypeQueue(); + } + return this; + }; + /** @internalapi */ + ParamTypes.prototype._flushTypeQueue = function () { + while (this.typeQueue.length) { + var type = this.typeQueue.shift(); + if (type.pattern) + throw new Error("You cannot override a type's .pattern at runtime."); + extend(this.types[type.name], services.$injector.invoke(type.def)); + } + }; + return ParamTypes; +}()); +/** @hidden */ +function initDefaultTypes() { + var makeDefaultType = function (def) { + var valToString = function (val$$1) { + return val$$1 != null ? val$$1.toString() : val$$1; + }; + var defaultTypeBase = { + encode: valToString, + decode: valToString, + is: is(String), + pattern: /.*/, + equals: function (a, b) { return a == b; }, + }; + return extend({}, defaultTypeBase, def); + }; + // Default Parameter Type Definitions + extend(ParamTypes.prototype, { + string: makeDefaultType({}), + path: makeDefaultType({ + pattern: /[^/]*/, + }), + query: makeDefaultType({}), + hash: makeDefaultType({ + inherit: false, + }), + int: makeDefaultType({ + decode: function (val$$1) { return parseInt(val$$1, 10); }, + is: function (val$$1) { + return !isNullOrUndefined(val$$1) && this.decode(val$$1.toString()) === val$$1; + }, + pattern: /-?\d+/, + }), + bool: makeDefaultType({ + encode: function (val$$1) { return val$$1 && 1 || 0; }, + decode: function (val$$1) { return parseInt(val$$1, 10) !== 0; }, + is: is(Boolean), + pattern: /0|1/, + }), + date: makeDefaultType({ + encode: function (val$$1) { + return !this.is(val$$1) ? undefined : [ + val$$1.getFullYear(), + ('0' + (val$$1.getMonth() + 1)).slice(-2), + ('0' + val$$1.getDate()).slice(-2), + ].join("-"); + }, + decode: function (val$$1) { + if (this.is(val$$1)) + return val$$1; + var match = this.capture.exec(val$$1); + return match ? new Date(match[1], match[2] - 1, match[3]) : undefined; + }, + is: function (val$$1) { return val$$1 instanceof Date && !isNaN(val$$1.valueOf()); }, + equals: function (l, r) { + return ['getFullYear', 'getMonth', 'getDate'] + .reduce(function (acc, fn) { return acc && l[fn]() === r[fn](); }, true); + }, + pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/, + capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/, + }), + json: makeDefaultType({ + encode: toJson, + decode: fromJson, + is: is(Object), + equals: equals, + pattern: /[^/]*/, + }), + // does not encode/decode + any: makeDefaultType({ + encode: identity, + decode: identity, + is: function () { return true; }, + equals: equals, + }), + }); +} +initDefaultTypes(); + +/** + * @coreapi + * @module params + */ +/** */ +/** @internalapi */ +var StateParams = /** @class */ (function () { + function StateParams(params) { + if (params === void 0) { params = {}; } + extend(this, params); + } + /** + * Merges a set of parameters with all parameters inherited between the common parents of the + * current state and a given destination state. + * + * @param {Object} newParams The set of parameters which will be composited with inherited params. + * @param {Object} $current Internal definition of object representing the current state. + * @param {Object} $to Internal definition of object representing state to transition to. + */ + StateParams.prototype.$inherit = function (newParams, $current, $to) { + var parents = ancestors($current, $to), parentParams, inherited = {}, inheritList = []; + for (var i in parents) { + if (!parents[i] || !parents[i].params) + continue; + parentParams = Object.keys(parents[i].params); + if (!parentParams.length) + continue; + for (var j in parentParams) { + if (inheritList.indexOf(parentParams[j]) >= 0) + continue; + inheritList.push(parentParams[j]); + inherited[parentParams[j]] = this[parentParams[j]]; + } + } + return extend({}, inherited, newParams); + }; + + return StateParams; +}()); + +/** @module path */ /** for typedoc */ + +/** @module resolve */ /** for typedoc */ + +/** @module state */ /** for typedoc */ +var parseUrl = function (url) { + if (!isString(url)) + return false; + var root$$1 = url.charAt(0) === '^'; + return { val: root$$1 ? url.substring(1) : url, root: root$$1 }; +}; +function nameBuilder(state) { + return state.name; +} +function selfBuilder(state) { + state.self.$$state = function () { return state; }; + return state.self; +} +function dataBuilder(state) { + if (state.parent && state.parent.data) { + state.data = state.self.data = inherit(state.parent.data, state.data); + } + return state.data; +} +var getUrlBuilder = function ($urlMatcherFactoryProvider, root$$1) { + return function urlBuilder(state) { + var stateDec = state; + // For future states, i.e., states whose name ends with `.**`, + // match anything that starts with the url prefix + if (stateDec && stateDec.url && stateDec.name && stateDec.name.match(/\.\*\*$/)) { + stateDec.url += "{remainder:any}"; // match any path (.*) + } + var parsed = parseUrl(stateDec.url), parent = state.parent; + var url = !parsed ? stateDec.url : $urlMatcherFactoryProvider.compile(parsed.val, { + params: state.params || {}, + paramMap: function (paramConfig, isSearch) { + if (stateDec.reloadOnSearch === false && isSearch) + paramConfig = extend(paramConfig || {}, { dynamic: true }); + return paramConfig; + } + }); + if (!url) + return null; + if (!$urlMatcherFactoryProvider.isMatcher(url)) + throw new Error("Invalid url '" + url + "' in state '" + state + "'"); + return (parsed && parsed.root) ? url : ((parent && parent.navigable) || root$$1()).url.append(url); + }; +}; +var getNavigableBuilder = function (isRoot) { + return function navigableBuilder(state) { + return !isRoot(state) && state.url ? state : (state.parent ? state.parent.navigable : null); + }; +}; +var getParamsBuilder = function (paramFactory) { + return function paramsBuilder(state) { + var makeConfigParam = function (config, id) { return paramFactory.fromConfig(id, null, config); }; + var urlParams = (state.url && state.url.parameters({ inherit: false })) || []; + var nonUrlParams = values(mapObj(omit(state.params || {}, urlParams.map(prop('id'))), makeConfigParam)); + return urlParams.concat(nonUrlParams).map(function (p) { return [p.id, p]; }).reduce(applyPairs, {}); + }; +}; +function pathBuilder(state) { + return state.parent ? state.parent.path.concat(state) : /*root*/ [state]; +} +function includesBuilder(state) { + var includes = state.parent ? extend({}, state.parent.includes) : {}; + includes[state.name] = true; + return includes; +} +/** + * This is a [[StateBuilder.builder]] function for the `resolve:` block on a [[StateDeclaration]]. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * validates the `resolve` property and converts it to a [[Resolvable]] array. + * + * resolve: input value can be: + * + * { + * // analyzed but not injected + * myFooResolve: function() { return "myFooData"; }, + * + * // function.toString() parsed, "DependencyName" dep as string (not min-safe) + * myBarResolve: function(DependencyName) { return DependencyName.fetchSomethingAsPromise() }, + * + * // Array split; "DependencyName" dep as string + * myBazResolve: [ "DependencyName", function(dep) { return dep.fetchSomethingAsPromise() }, + * + * // Array split; DependencyType dep as token (compared using ===) + * myQuxResolve: [ DependencyType, function(dep) { return dep.fetchSometingAsPromise() }, + * + * // val.$inject used as deps + * // where: + * // corgeResolve.$inject = ["DependencyName"]; + * // function corgeResolve(dep) { dep.fetchSometingAsPromise() } + * // then "DependencyName" dep as string + * myCorgeResolve: corgeResolve, + * + * // inject service by name + * // When a string is found, desugar creating a resolve that injects the named service + * myGraultResolve: "SomeService" + * } + * + * or: + * + * [ + * new Resolvable("myFooResolve", function() { return "myFooData" }), + * new Resolvable("myBarResolve", function(dep) { return dep.fetchSomethingAsPromise() }, [ "DependencyName" ]), + * { provide: "myBazResolve", useFactory: function(dep) { dep.fetchSomethingAsPromise() }, deps: [ "DependencyName" ] } + * ] + */ +function resolvablesBuilder(state) { + /** convert resolve: {} and resolvePolicy: {} objects to an array of tuples */ + var objects2Tuples = function (resolveObj, resolvePolicies) { + return Object.keys(resolveObj || {}).map(function (token) { return ({ token: token, val: resolveObj[token], deps: undefined, policy: resolvePolicies[token] }); }); + }; + /** fetch DI annotations from a function or ng1-style array */ + var annotate = function (fn) { + var $injector = services.$injector; + // ng1 doesn't have an $injector until runtime. + // If the $injector doesn't exist, use "deferred" literal as a + // marker indicating they should be annotated when runtime starts + return fn['$inject'] || ($injector && $injector.annotate(fn, $injector.strictDi)) || "deferred"; + }; + /** true if the object has both `token` and `resolveFn`, and is probably a [[ResolveLiteral]] */ + var isResolveLiteral = function (obj) { return !!(obj.token && obj.resolveFn); }; + /** true if the object looks like a provide literal, or a ng2 Provider */ + var isLikeNg2Provider = function (obj) { return !!((obj.provide || obj.token) && (obj.useValue || obj.useFactory || obj.useExisting || obj.useClass)); }; + /** true if the object looks like a tuple from obj2Tuples */ + var isTupleFromObj = function (obj) { return !!(obj && obj.val && (isString(obj.val) || isArray(obj.val) || isFunction(obj.val))); }; + /** extracts the token from a Provider or provide literal */ + var token = function (p) { return p.provide || p.token; }; + /** Given a literal resolve or provider object, returns a Resolvable */ + var literal2Resolvable = pattern([ + [prop('resolveFn'), function (p) { return new Resolvable(token(p), p.resolveFn, p.deps, p.policy); }], + [prop('useFactory'), function (p) { return new Resolvable(token(p), p.useFactory, (p.deps || p.dependencies), p.policy); }], + [prop('useClass'), function (p) { return new Resolvable(token(p), function () { return new p.useClass(); }, [], p.policy); }], + [prop('useValue'), function (p) { return new Resolvable(token(p), function () { return p.useValue; }, [], p.policy, p.useValue); }], + [prop('useExisting'), function (p) { return new Resolvable(token(p), identity, [p.useExisting], p.policy); }], + ]); + var tuple2Resolvable = pattern([ + [pipe(prop("val"), isString), function (tuple) { return new Resolvable(tuple.token, identity, [tuple.val], tuple.policy); }], + [pipe(prop("val"), isArray), function (tuple) { return new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy); }], + [pipe(prop("val"), isFunction), function (tuple) { return new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy); }], + ]); + var item2Resolvable = pattern([ + [is(Resolvable), function (r) { return r; }], + [isResolveLiteral, literal2Resolvable], + [isLikeNg2Provider, literal2Resolvable], + [isTupleFromObj, tuple2Resolvable], + [val(true), function (obj) { throw new Error("Invalid resolve value: " + stringify(obj)); }] + ]); + // If resolveBlock is already an array, use it as-is. + // Otherwise, assume it's an object and convert to an Array of tuples + var decl = state.resolve; + var items = isArray(decl) ? decl : objects2Tuples(decl, state.resolvePolicy || {}); + return items.map(item2Resolvable); +} +/** + * @internalapi A internal global service + * + * StateBuilder is a factory for the internal [[StateObject]] objects. + * + * When you register a state with the [[StateRegistry]], you register a plain old javascript object which + * conforms to the [[StateDeclaration]] interface. This factory takes that object and builds the corresponding + * [[StateObject]] object, which has an API and is used internally. + * + * Custom properties or API may be added to the internal [[StateObject]] object by registering a decorator function + * using the [[builder]] method. + */ +var StateBuilder = /** @class */ (function () { + function StateBuilder(matcher, urlMatcherFactory) { + this.matcher = matcher; + var self = this; + var root$$1 = function () { return matcher.find(""); }; + var isRoot = function (state) { return state.name === ""; }; + function parentBuilder(state) { + if (isRoot(state)) + return null; + return matcher.find(self.parentName(state)) || root$$1(); + } + this.builders = { + name: [nameBuilder], + self: [selfBuilder], + parent: [parentBuilder], + data: [dataBuilder], + // Build a URLMatcher if necessary, either via a relative or absolute URL + url: [getUrlBuilder(urlMatcherFactory, root$$1)], + // Keep track of the closest ancestor state that has a URL (i.e. is navigable) + navigable: [getNavigableBuilder(isRoot)], + params: [getParamsBuilder(urlMatcherFactory.paramFactory)], + // Each framework-specific ui-router implementation should define its own `views` builder + // e.g., src/ng1/statebuilders/views.ts + views: [], + // Keep a full path from the root down to this state as this is needed for state activation. + path: [pathBuilder], + // Speed up $state.includes() as it's used a lot + includes: [includesBuilder], + resolvables: [resolvablesBuilder] + }; + } + /** + * Registers a [[BuilderFunction]] for a specific [[StateObject]] property (e.g., `parent`, `url`, or `path`). + * More than one BuilderFunction can be registered for a given property. + * + * The BuilderFunction(s) will be used to define the property on any subsequently built [[StateObject]] objects. + * + * @param name The name of the State property being registered for. + * @param fn The BuilderFunction which will be used to build the State property + * @returns a function which deregisters the BuilderFunction + */ + StateBuilder.prototype.builder = function (name, fn) { + var builders = this.builders; + var array = builders[name] || []; + // Backwards compat: if only one builder exists, return it, else return whole arary. + if (isString(name) && !isDefined(fn)) + return array.length > 1 ? array : array[0]; + if (!isString(name) || !isFunction(fn)) + return; + builders[name] = array; + builders[name].push(fn); + return function () { return builders[name].splice(builders[name].indexOf(fn, 1)) && null; }; + }; + /** + * Builds all of the properties on an essentially blank State object, returning a State object which has all its + * properties and API built. + * + * @param state an uninitialized State object + * @returns the built State object + */ + StateBuilder.prototype.build = function (state) { + var _a = this, matcher = _a.matcher, builders = _a.builders; + var parent = this.parentName(state); + if (parent && !matcher.find(parent, undefined, false)) { + return null; + } + for (var key in builders) { + if (!builders.hasOwnProperty(key)) + continue; + var chain = builders[key].reduce(function (parentFn, step) { return function (_state) { return step(_state, parentFn); }; }, noop$1); + state[key] = chain(state); + } + return state; + }; + StateBuilder.prototype.parentName = function (state) { + // name = 'foo.bar.baz.**' + var name = state.name || ""; + // segments = ['foo', 'bar', 'baz', '.**'] + var segments = name.split('.'); + // segments = ['foo', 'bar', 'baz'] + var lastSegment = segments.pop(); + // segments = ['foo', 'bar'] (ignore .** segment for future states) + if (lastSegment === '**') + segments.pop(); + if (segments.length) { + if (state.parent) { + throw new Error("States that specify the 'parent:' property should not have a '.' in their name (" + name + ")"); + } + // 'foo.bar' + return segments.join("."); + } + if (!state.parent) + return ""; + return isString(state.parent) ? state.parent : state.parent.name; + }; + StateBuilder.prototype.name = function (state) { + var name = state.name; + if (name.indexOf('.') !== -1 || !state.parent) + return name; + var parentName = isString(state.parent) ? state.parent : state.parent.name; + return parentName ? parentName + "." + name : name; + }; + return StateBuilder; +}()); + +/** @module state */ /** for typedoc */ +var StateMatcher = /** @class */ (function () { + function StateMatcher(_states) { + this._states = _states; + } + StateMatcher.prototype.isRelative = function (stateName) { + stateName = stateName || ""; + return stateName.indexOf(".") === 0 || stateName.indexOf("^") === 0; + }; + StateMatcher.prototype.find = function (stateOrName, base, matchGlob) { + if (matchGlob === void 0) { matchGlob = true; } + if (!stateOrName && stateOrName !== "") + return undefined; + var isStr = isString(stateOrName); + var name = isStr ? stateOrName : stateOrName.name; + if (this.isRelative(name)) + name = this.resolvePath(name, base); + var state = this._states[name]; + if (state && (isStr || (!isStr && (state === stateOrName || state.self === stateOrName)))) { + return state; + } + else if (isStr && matchGlob) { + var _states = values(this._states); + var matches = _states.filter(function (state) { + return state.__stateObjectCache.nameGlob && + state.__stateObjectCache.nameGlob.matches(name); + }); + if (matches.length > 1) { + console.log("stateMatcher.find: Found multiple matches for " + name + " using glob: ", matches.map(function (match) { return match.name; })); + } + return matches[0]; + } + return undefined; + }; + StateMatcher.prototype.resolvePath = function (name, base) { + if (!base) + throw new Error("No reference point given for path '" + name + "'"); + var baseState = this.find(base); + var splitName = name.split("."), i = 0, pathLength = splitName.length, current = baseState; + for (; i < pathLength; i++) { + if (splitName[i] === "" && i === 0) { + current = baseState; + continue; + } + if (splitName[i] === "^") { + if (!current.parent) + throw new Error("Path '" + name + "' not valid for state '" + baseState.name + "'"); + current = current.parent; + continue; + } + break; + } + var relName = splitName.slice(i).join("."); + return current.name + (current.name && relName ? "." : "") + relName; + }; + return StateMatcher; +}()); + +/** @module state */ /** for typedoc */ +/** @internalapi */ +var StateQueueManager = /** @class */ (function () { + function StateQueueManager($registry, $urlRouter, states, builder, listeners) { + this.$registry = $registry; + this.$urlRouter = $urlRouter; + this.states = states; + this.builder = builder; + this.listeners = listeners; + this.queue = []; + this.matcher = $registry.matcher; + } + /** @internalapi */ + StateQueueManager.prototype.dispose = function () { + this.queue = []; + }; + StateQueueManager.prototype.register = function (stateDecl) { + var queue = this.queue; + var state = StateObject.create(stateDecl); + var name = state.name; + if (!isString(name)) + throw new Error("State must have a valid name"); + if (this.states.hasOwnProperty(name) || inArray(queue.map(prop('name')), name)) + throw new Error("State '" + name + "' is already defined"); + queue.push(state); + this.flush(); + return state; + }; + StateQueueManager.prototype.flush = function () { + var _this = this; + var _a = this, queue = _a.queue, states = _a.states, builder = _a.builder; + var registered = [], // states that got registered + orphans = [], // states that don't yet have a parent registered + previousQueueLength = {}; // keep track of how long the queue when an orphan was first encountered + var getState = function (name) { + return _this.states.hasOwnProperty(name) && _this.states[name]; + }; + while (queue.length > 0) { + var state = queue.shift(); + var name_1 = state.name; + var result = builder.build(state); + var orphanIdx = orphans.indexOf(state); + if (result) { + var existingState = getState(name_1); + if (existingState && existingState.name === name_1) { + throw new Error("State '" + name_1 + "' is already defined"); + } + var existingFutureState = getState(name_1 + ".**"); + if (existingFutureState) { + // Remove future state of the same name + this.$registry.deregister(existingFutureState); + } + states[name_1] = state; + this.attachRoute(state); + if (orphanIdx >= 0) + orphans.splice(orphanIdx, 1); + registered.push(state); + continue; + } + var prev = previousQueueLength[name_1]; + previousQueueLength[name_1] = queue.length; + if (orphanIdx >= 0 && prev === queue.length) { + // Wait until two consecutive iterations where no additional states were dequeued successfully. + // throw new Error(`Cannot register orphaned state '${name}'`); + queue.push(state); + return states; + } + else if (orphanIdx < 0) { + orphans.push(state); + } + queue.push(state); + } + if (registered.length) { + this.listeners.forEach(function (listener) { return listener("registered", registered.map(function (s) { return s.self; })); }); + } + return states; + }; + StateQueueManager.prototype.attachRoute = function (state) { + if (state.abstract || !state.url) + return; + this.$urlRouter.rule(this.$urlRouter.urlRuleFactory.create(state)); + }; + return StateQueueManager; +}()); + +/** + * @coreapi + * @module state + */ /** for typedoc */ +var StateRegistry = /** @class */ (function () { + /** @internalapi */ + function StateRegistry(_router) { + this._router = _router; + this.states = {}; + this.listeners = []; + this.matcher = new StateMatcher(this.states); + this.builder = new StateBuilder(this.matcher, _router.urlMatcherFactory); + this.stateQueue = new StateQueueManager(this, _router.urlRouter, this.states, this.builder, this.listeners); + this._registerRoot(); + } + /** @internalapi */ + StateRegistry.prototype._registerRoot = function () { + var rootStateDef = { + name: '', + url: '^', + views: null, + params: { + '#': { value: null, type: 'hash', dynamic: true } + }, + abstract: true + }; + var _root = this._root = this.stateQueue.register(rootStateDef); + _root.navigable = null; + }; + /** @internalapi */ + StateRegistry.prototype.dispose = function () { + var _this = this; + this.stateQueue.dispose(); + this.listeners = []; + this.get().forEach(function (state) { return _this.get(state) && _this.deregister(state); }); + }; + /** + * Listen for a State Registry events + * + * Adds a callback that is invoked when states are registered or deregistered with the StateRegistry. + * + * #### Example: + * ```js + * let allStates = registry.get(); + * + * // Later, invoke deregisterFn() to remove the listener + * let deregisterFn = registry.onStatesChanged((event, states) => { + * switch(event) { + * case: 'registered': + * states.forEach(state => allStates.push(state)); + * break; + * case: 'deregistered': + * states.forEach(state => { + * let idx = allStates.indexOf(state); + * if (idx !== -1) allStates.splice(idx, 1); + * }); + * break; + * } + * }); + * ``` + * + * @param listener a callback function invoked when the registered states changes. + * The function receives two parameters, `event` and `state`. + * See [[StateRegistryListener]] + * @return a function that deregisters the listener + */ + StateRegistry.prototype.onStatesChanged = function (listener) { + this.listeners.push(listener); + return function deregisterListener() { + removeFrom(this.listeners)(listener); + }.bind(this); + }; + /** + * Gets the implicit root state + * + * Gets the root of the state tree. + * The root state is implicitly created by UI-Router. + * Note: this returns the internal [[StateObject]] representation, not a [[StateDeclaration]] + * + * @return the root [[StateObject]] + */ + StateRegistry.prototype.root = function () { + return this._root; + }; + /** + * Adds a state to the registry + * + * Registers a [[StateDeclaration]] or queues it for registration. + * + * Note: a state will be queued if the state's parent isn't yet registered. + * + * @param stateDefinition the definition of the state to register. + * @returns the internal [[StateObject]] object. + * If the state was successfully registered, then the object is fully built (See: [[StateBuilder]]). + * If the state was only queued, then the object is not fully built. + */ + StateRegistry.prototype.register = function (stateDefinition) { + return this.stateQueue.register(stateDefinition); + }; + /** @hidden */ + StateRegistry.prototype._deregisterTree = function (state) { + var _this = this; + var all$$1 = this.get().map(function (s) { return s.$$state(); }); + var getChildren = function (states) { + var children = all$$1.filter(function (s) { return states.indexOf(s.parent) !== -1; }); + return children.length === 0 ? children : children.concat(getChildren(children)); + }; + var children = getChildren([state]); + var deregistered = [state].concat(children).reverse(); + deregistered.forEach(function (state) { + var $ur = _this._router.urlRouter; + // Remove URL rule + $ur.rules().filter(propEq("state", state)).forEach($ur.removeRule.bind($ur)); + // Remove state from registry + delete _this.states[state.name]; + }); + return deregistered; + }; + /** + * Removes a state from the registry + * + * This removes a state from the registry. + * If the state has children, they are are also removed from the registry. + * + * @param stateOrName the state's name or object representation + * @returns {StateObject[]} a list of removed states + */ + StateRegistry.prototype.deregister = function (stateOrName) { + var _state = this.get(stateOrName); + if (!_state) + throw new Error("Can't deregister state; not found: " + stateOrName); + var deregisteredStates = this._deregisterTree(_state.$$state()); + this.listeners.forEach(function (listener) { return listener("deregistered", deregisteredStates.map(function (s) { return s.self; })); }); + return deregisteredStates; + }; + StateRegistry.prototype.get = function (stateOrName, base) { + var _this = this; + if (arguments.length === 0) + return Object.keys(this.states).map(function (name) { return _this.states[name].self; }); + var found = this.matcher.find(stateOrName, base); + return found && found.self || null; + }; + StateRegistry.prototype.decorator = function (name, func) { + return this.builder.builder(name, func); + }; + return StateRegistry; +}()); + +/** + * @coreapi + * @module url + */ +/** for typedoc */ +/** @hidden */ +function quoteRegExp(string, param) { + var surroundPattern = ['', ''], result = string.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&"); + if (!param) + return result; + switch (param.squash) { + case false: + surroundPattern = ['(', ')' + (param.isOptional ? '?' : '')]; + break; + case true: + result = result.replace(/\/$/, ''); + surroundPattern = ['(?:\/(', ')|\/)?']; + break; + default: + surroundPattern = ["(" + param.squash + "|", ')?']; + break; + } + return result + surroundPattern[0] + param.type.pattern.source + surroundPattern[1]; +} +/** @hidden */ +var memoizeTo = function (obj, prop$$1, fn) { + return obj[prop$$1] = obj[prop$$1] || fn(); +}; +/** @hidden */ +var splitOnSlash = splitOnDelim('/'); +/** + * Matches URLs against patterns. + * + * Matches URLs against patterns and extracts named parameters from the path or the search + * part of the URL. + * + * A URL pattern consists of a path pattern, optionally followed by '?' and a list of search (query) + * parameters. Multiple search parameter names are separated by '&'. Search parameters + * do not influence whether or not a URL is matched, but their values are passed through into + * the matched parameters returned by [[UrlMatcher.exec]]. + * + * - *Path parameters* are defined using curly brace placeholders (`/somepath/{param}`) + * or colon placeholders (`/somePath/:param`). + * + * - *A parameter RegExp* may be defined for a param after a colon + * (`/somePath/{param:[a-zA-Z0-9]+}`) in a curly brace placeholder. + * The regexp must match for the url to be matched. + * Should the regexp itself contain curly braces, they must be in matched pairs or escaped with a backslash. + * + * Note: a RegExp parameter will encode its value using either [[ParamTypes.path]] or [[ParamTypes.query]]. + * + * - *Custom parameter types* may also be specified after a colon (`/somePath/{param:int}`) in curly brace parameters. + * See [[UrlMatcherFactory.type]] for more information. + * + * - *Catch-all parameters* are defined using an asterisk placeholder (`/somepath/*catchallparam`). + * A catch-all * parameter value will contain the remainder of the URL. + * + * --- + * + * Parameter names may contain only word characters (latin letters, digits, and underscore) and + * must be unique within the pattern (across both path and search parameters). + * A path parameter matches any number of characters other than '/'. For catch-all + * placeholders the path parameter matches any number of characters. + * + * Examples: + * + * * `'/hello/'` - Matches only if the path is exactly '/hello/'. There is no special treatment for + * trailing slashes, and patterns have to match the entire path, not just a prefix. + * * `'/user/:id'` - Matches '/user/bob' or '/user/1234!!!' or even '/user/' but not '/user' or + * '/user/bob/details'. The second path segment will be captured as the parameter 'id'. + * * `'/user/{id}'` - Same as the previous example, but using curly brace syntax. + * * `'/user/{id:[^/]*}'` - Same as the previous example. + * * `'/user/{id:[0-9a-fA-F]{1,8}}'` - Similar to the previous example, but only matches if the id + * parameter consists of 1 to 8 hex digits. + * * `'/files/{path:.*}'` - Matches any URL starting with '/files/' and captures the rest of the + * path into the parameter 'path'. + * * `'/files/*path'` - ditto. + * * `'/calendar/{start:date}'` - Matches "/calendar/2014-11-12" (because the pattern defined + * in the built-in `date` ParamType matches `2014-11-12`) and provides a Date object in $stateParams.start + * + */ +var UrlMatcher = /** @class */ (function () { + /** + * @param pattern The pattern to compile into a matcher. + * @param paramTypes The [[ParamTypes]] registry + * @param config A configuration object + * - `caseInsensitive` - `true` if URL matching should be case insensitive, otherwise `false`, the default value (for backward compatibility) is `false`. + * - `strict` - `false` if matching against a URL with a trailing slash should be treated as equivalent to a URL without a trailing slash, the default value is `true`. + */ + function UrlMatcher(pattern$$1, paramTypes, paramFactory, config) { + var _this = this; + this.config = config; + /** @hidden */ + this._cache = { path: [this] }; + /** @hidden */ + this._children = []; + /** @hidden */ + this._params = []; + /** @hidden */ + this._segments = []; + /** @hidden */ + this._compiled = []; + this.pattern = pattern$$1; + this.config = defaults(this.config, { + params: {}, + strict: true, + caseInsensitive: false, + paramMap: identity + }); + // Find all placeholders and create a compiled pattern, using either classic or curly syntax: + // '*' name + // ':' name + // '{' name '}' + // '{' name ':' regexp '}' + // The regular expression is somewhat complicated due to the need to allow curly braces + // inside the regular expression. The placeholder regexp breaks down as follows: + // ([:*])([\w\[\]]+) - classic placeholder ($1 / $2) (search version has - for snake-case) + // \{([\w\[\]]+)(?:\:\s*( ... ))?\} - curly brace placeholder ($3) with optional regexp/type ... ($4) (search version has - for snake-case + // (?: ... | ... | ... )+ - the regexp consists of any number of atoms, an atom being either + // [^{}\\]+ - anything other than curly braces or backslash + // \\. - a backslash escape + // \{(?:[^{}\\]+|\\.)*\} - a matched set of curly braces containing other atoms + var placeholder = /([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, searchPlaceholder = /([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, last = 0, m, patterns = []; + var checkParamErrors = function (id) { + if (!UrlMatcher.nameValidator.test(id)) + throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern$$1 + "'"); + if (find(_this._params, propEq('id', id))) + throw new Error("Duplicate parameter name '" + id + "' in pattern '" + pattern$$1 + "'"); + }; + // Split into static segments separated by path parameter placeholders. + // The number of segments is always 1 more than the number of parameters. + var matchDetails = function (m, isSearch) { + // IE[78] returns '' for unmatched groups instead of null + var id = m[2] || m[3]; + var regexp = isSearch ? m[4] : m[4] || (m[1] === '*' ? '[\\s\\S]*' : null); + var makeRegexpType = function (regexp) { return inherit(paramTypes.type(isSearch ? "query" : "path"), { + pattern: new RegExp(regexp, _this.config.caseInsensitive ? 'i' : undefined) + }); }; + return { + id: id, + regexp: regexp, + cfg: _this.config.params[id], + segment: pattern$$1.substring(last, m.index), + type: !regexp ? null : paramTypes.type(regexp) || makeRegexpType(regexp) + }; + }; + var p, segment; + while ((m = placeholder.exec(pattern$$1))) { + p = matchDetails(m, false); + if (p.segment.indexOf('?') >= 0) + break; // we're into the search part + checkParamErrors(p.id); + this._params.push(paramFactory.fromPath(p.id, p.type, this.config.paramMap(p.cfg, false))); + this._segments.push(p.segment); + patterns.push([p.segment, tail(this._params)]); + last = placeholder.lastIndex; + } + segment = pattern$$1.substring(last); + // Find any search parameter names and remove them from the last segment + var i = segment.indexOf('?'); + if (i >= 0) { + var search = segment.substring(i); + segment = segment.substring(0, i); + if (search.length > 0) { + last = 0; + while ((m = searchPlaceholder.exec(search))) { + p = matchDetails(m, true); + checkParamErrors(p.id); + this._params.push(paramFactory.fromSearch(p.id, p.type, this.config.paramMap(p.cfg, true))); + last = placeholder.lastIndex; + // check if ?& + } + } + } + this._segments.push(segment); + this._compiled = patterns.map(function (pattern$$1) { return quoteRegExp.apply(null, pattern$$1); }).concat(quoteRegExp(segment)); + } + /** + * Creates a new concatenated UrlMatcher + * + * Builds a new UrlMatcher by appending another UrlMatcher to this one. + * + * @param url A `UrlMatcher` instance to append as a child of the current `UrlMatcher`. + */ + UrlMatcher.prototype.append = function (url) { + this._children.push(url); + url._cache = { + path: this._cache.path.concat(url), + parent: this, + pattern: null, + }; + return url; + }; + /** @hidden */ + UrlMatcher.prototype.isRoot = function () { + return this._cache.path[0] === this; + }; + /** Returns the input pattern string */ + UrlMatcher.prototype.toString = function () { + return this.pattern; + }; + /** + * Tests the specified url/path against this matcher. + * + * Tests if the given url matches this matcher's pattern, and returns an object containing the captured + * parameter values. Returns null if the path does not match. + * + * The returned object contains the values + * of any search parameters that are mentioned in the pattern, but their value may be null if + * they are not present in `search`. This means that search parameters are always treated + * as optional. + * + * #### Example: + * ```js + * new UrlMatcher('/user/{id}?q&r').exec('/user/bob', { + * x: '1', q: 'hello' + * }); + * // returns { id: 'bob', q: 'hello', r: null } + * ``` + * + * @param path The URL path to match, e.g. `$location.path()`. + * @param search URL search parameters, e.g. `$location.search()`. + * @param hash URL hash e.g. `$location.hash()`. + * @param options + * + * @returns The captured parameter values. + */ + UrlMatcher.prototype.exec = function (path, search, hash, options) { + var _this = this; + if (search === void 0) { search = {}; } + if (options === void 0) { options = {}; } + var match = memoizeTo(this._cache, 'pattern', function () { + return new RegExp([ + '^', + unnest(_this._cache.path.map(prop('_compiled'))).join(''), + _this.config.strict === false ? '\/?' : '', + '$' + ].join(''), _this.config.caseInsensitive ? 'i' : undefined); + }).exec(path); + if (!match) + return null; + //options = defaults(options, { isolate: false }); + var allParams = this.parameters(), pathParams = allParams.filter(function (param) { return !param.isSearch(); }), searchParams = allParams.filter(function (param) { return param.isSearch(); }), nPathSegments = this._cache.path.map(function (urlm) { return urlm._segments.length - 1; }).reduce(function (a, x) { return a + x; }), values$$1 = {}; + if (nPathSegments !== match.length - 1) + throw new Error("Unbalanced capture group in route '" + this.pattern + "'"); + function decodePathArray(string) { + var reverseString = function (str) { return str.split("").reverse().join(""); }; + var unquoteDashes = function (str) { return str.replace(/\\-/g, "-"); }; + var split = reverseString(string).split(/-(?!\\)/); + var allReversed = map(split, reverseString); + return map(allReversed, unquoteDashes).reverse(); + } + for (var i = 0; i < nPathSegments; i++) { + var param = pathParams[i]; + var value = match[i + 1]; + // if the param value matches a pre-replace pair, replace the value before decoding. + for (var j = 0; j < param.replace.length; j++) { + if (param.replace[j].from === value) + value = param.replace[j].to; + } + if (value && param.array === true) + value = decodePathArray(value); + if (isDefined(value)) + value = param.type.decode(value); + values$$1[param.id] = param.value(value); + } + searchParams.forEach(function (param) { + var value = search[param.id]; + for (var j = 0; j < param.replace.length; j++) { + if (param.replace[j].from === value) + value = param.replace[j].to; + } + if (isDefined(value)) + value = param.type.decode(value); + values$$1[param.id] = param.value(value); + }); + if (hash) + values$$1["#"] = hash; + return values$$1; + }; + /** + * @hidden + * Returns all the [[Param]] objects of all path and search parameters of this pattern in order of appearance. + * + * @returns {Array.} An array of [[Param]] objects. Must be treated as read-only. If the + * pattern has no parameters, an empty array is returned. + */ + UrlMatcher.prototype.parameters = function (opts) { + if (opts === void 0) { opts = {}; } + if (opts.inherit === false) + return this._params; + return unnest(this._cache.path.map(function (matcher) { return matcher._params; })); + }; + /** + * @hidden + * Returns a single parameter from this UrlMatcher by id + * + * @param id + * @param opts + * @returns {T|Param|any|boolean|UrlMatcher|null} + */ + UrlMatcher.prototype.parameter = function (id, opts) { + var _this = this; + if (opts === void 0) { opts = {}; } + var findParam = function () { + for (var _i = 0, _a = _this._params; _i < _a.length; _i++) { + var param = _a[_i]; + if (param.id === id) + return param; + } + }; + var parent = this._cache.parent; + return findParam() || (opts.inherit !== false && parent && parent.parameter(id, opts)) || null; + }; + /** + * Validates the input parameter values against this UrlMatcher + * + * Checks an object hash of parameters to validate their correctness according to the parameter + * types of this `UrlMatcher`. + * + * @param params The object hash of parameters to validate. + * @returns Returns `true` if `params` validates, otherwise `false`. + */ + UrlMatcher.prototype.validates = function (params) { + var validParamVal = function (param, val$$1) { + return !param || param.validates(val$$1); + }; + params = params || {}; + // I'm not sure why this checks only the param keys passed in, and not all the params known to the matcher + var paramSchema = this.parameters().filter(function (paramDef) { return params.hasOwnProperty(paramDef.id); }); + return paramSchema.map(function (paramDef) { return validParamVal(paramDef, params[paramDef.id]); }).reduce(allTrueR, true); + }; + /** + * Given a set of parameter values, creates a URL from this UrlMatcher. + * + * Creates a URL that matches this pattern by substituting the specified values + * for the path and search parameters. + * + * #### Example: + * ```js + * new UrlMatcher('/user/{id}?q').format({ id:'bob', q:'yes' }); + * // returns '/user/bob?q=yes' + * ``` + * + * @param values the values to substitute for the parameters in this pattern. + * @returns the formatted URL (path and optionally search part). + */ + UrlMatcher.prototype.format = function (values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + // Build the full path of UrlMatchers (including all parent UrlMatchers) + var urlMatchers = this._cache.path; + // Extract all the static segments and Params (processed as ParamDetails) + // into an ordered array + var pathSegmentsAndParams = urlMatchers.map(UrlMatcher.pathSegmentsAndParams) + .reduce(unnestR, []) + .map(function (x) { return isString(x) ? x : getDetails(x); }); + // Extract the query params into a separate array + var queryParams = urlMatchers.map(UrlMatcher.queryParams) + .reduce(unnestR, []) + .map(getDetails); + var isInvalid = function (param) { return param.isValid === false; }; + if (pathSegmentsAndParams.concat(queryParams).filter(isInvalid).length) { + return null; + } + /** + * Given a Param, applies the parameter value, then returns detailed information about it + */ + function getDetails(param) { + // Normalize to typed value + var value = param.value(values$$1[param.id]); + var isValid = param.validates(value); + var isDefaultValue = param.isDefaultValue(value); + // Check if we're in squash mode for the parameter + var squash = isDefaultValue ? param.squash : false; + // Allow the Parameter's Type to encode the value + var encoded = param.type.encode(value); + return { param: param, value: value, isValid: isValid, isDefaultValue: isDefaultValue, squash: squash, encoded: encoded }; + } + // Build up the path-portion from the list of static segments and parameters + var pathString = pathSegmentsAndParams.reduce(function (acc, x) { + // The element is a static segment (a raw string); just append it + if (isString(x)) + return acc + x; + // Otherwise, it's a ParamDetails. + var squash = x.squash, encoded = x.encoded, param = x.param; + // If squash is === true, try to remove a slash from the path + if (squash === true) + return (acc.match(/\/$/)) ? acc.slice(0, -1) : acc; + // If squash is a string, use the string for the param value + if (isString(squash)) + return acc + squash; + if (squash !== false) + return acc; // ? + if (encoded == null) + return acc; + // If this parameter value is an array, encode the value using encodeDashes + if (isArray(encoded)) + return acc + map(encoded, UrlMatcher.encodeDashes).join("-"); + // If the parameter type is "raw", then do not encodeURIComponent + if (param.raw) + return acc + encoded; + // Encode the value + return acc + encodeURIComponent(encoded); + }, ""); + // Build the query string by applying parameter values (array or regular) + // then mapping to key=value, then flattening and joining using "&" + var queryString = queryParams.map(function (paramDetails) { + var param = paramDetails.param, squash = paramDetails.squash, encoded = paramDetails.encoded, isDefaultValue = paramDetails.isDefaultValue; + if (encoded == null || (isDefaultValue && squash !== false)) + return; + if (!isArray(encoded)) + encoded = [encoded]; + if (encoded.length === 0) + return; + if (!param.raw) + encoded = map(encoded, encodeURIComponent); + return encoded.map(function (val$$1) { return param.id + "=" + val$$1; }); + }).filter(identity).reduce(unnestR, []).join("&"); + // Concat the pathstring with the queryString (if exists) and the hashString (if exists) + return pathString + (queryString ? "?" + queryString : "") + (values$$1["#"] ? "#" + values$$1["#"] : ""); + }; + /** @hidden */ + UrlMatcher.encodeDashes = function (str) { + return encodeURIComponent(str).replace(/-/g, function (c) { return "%5C%" + c.charCodeAt(0).toString(16).toUpperCase(); }); + }; + /** @hidden Given a matcher, return an array with the matcher's path segments and path params, in order */ + UrlMatcher.pathSegmentsAndParams = function (matcher) { + var staticSegments = matcher._segments; + var pathParams = matcher._params.filter(function (p) { return p.location === exports.DefType.PATH; }); + return arrayTuples(staticSegments, pathParams.concat(undefined)) + .reduce(unnestR, []) + .filter(function (x) { return x !== "" && isDefined(x); }); + }; + /** @hidden Given a matcher, return an array with the matcher's query params */ + UrlMatcher.queryParams = function (matcher) { + return matcher._params.filter(function (p) { return p.location === exports.DefType.SEARCH; }); + }; + /** + * Compare two UrlMatchers + * + * This comparison function converts a UrlMatcher into static and dynamic path segments. + * Each static path segment is a static string between a path separator (slash character). + * Each dynamic segment is a path parameter. + * + * The comparison function sorts static segments before dynamic ones. + */ + UrlMatcher.compare = function (a, b) { + /** + * Turn a UrlMatcher and all its parent matchers into an array + * of slash literals '/', string literals, and Param objects + * + * This example matcher matches strings like "/foo/:param/tail": + * var matcher = $umf.compile("/foo").append($umf.compile("/:param")).append($umf.compile("/")).append($umf.compile("tail")); + * var result = segments(matcher); // [ '/', 'foo', '/', Param, '/', 'tail' ] + * + * Caches the result as `matcher._cache.segments` + */ + var segments = function (matcher) { + return matcher._cache.segments = matcher._cache.segments || + matcher._cache.path.map(UrlMatcher.pathSegmentsAndParams) + .reduce(unnestR, []) + .reduce(joinNeighborsR, []) + .map(function (x) { return isString(x) ? splitOnSlash(x) : x; }) + .reduce(unnestR, []); + }; + /** + * Gets the sort weight for each segment of a UrlMatcher + * + * Caches the result as `matcher._cache.weights` + */ + var weights = function (matcher) { + return matcher._cache.weights = matcher._cache.weights || + segments(matcher).map(function (segment) { + // Sort slashes first, then static strings, the Params + if (segment === '/') + return 1; + if (isString(segment)) + return 2; + if (segment instanceof Param) + return 3; + }); + }; + /** + * Pads shorter array in-place (mutates) + */ + var padArrays = function (l, r, padVal) { + var len = Math.max(l.length, r.length); + while (l.length < len) + l.push(padVal); + while (r.length < len) + r.push(padVal); + }; + var weightsA = weights(a), weightsB = weights(b); + padArrays(weightsA, weightsB, 0); + var cmp, i, pairs$$1 = arrayTuples(weightsA, weightsB); + for (i = 0; i < pairs$$1.length; i++) { + cmp = pairs$$1[i][0] - pairs$$1[i][1]; + if (cmp !== 0) + return cmp; + } + return 0; + }; + /** @hidden */ + UrlMatcher.nameValidator = /^\w+([-.]+\w+)*(?:\[\])?$/; + return UrlMatcher; +}()); + +/** + * @internalapi + * @module url + */ /** for typedoc */ +/** + * Factory for [[UrlMatcher]] instances. + * + * The factory is available to ng1 services as + * `$urlMatcherFactory` or ng1 providers as `$urlMatcherFactoryProvider`. + */ +var UrlMatcherFactory = /** @class */ (function () { + function UrlMatcherFactory() { + var _this = this; + /** @hidden */ this.paramTypes = new ParamTypes(); + /** @hidden */ this._isCaseInsensitive = false; + /** @hidden */ this._isStrictMode = true; + /** @hidden */ this._defaultSquashPolicy = false; + /** @hidden */ + this._getConfig = function (config) { + return extend({ strict: _this._isStrictMode, caseInsensitive: _this._isCaseInsensitive }, config); + }; + /** @internalapi Creates a new [[Param]] for a given location (DefType) */ + this.paramFactory = { + /** Creates a new [[Param]] from a CONFIG block */ + fromConfig: function (id, type, config) { + return new Param(id, type, config, exports.DefType.CONFIG, _this); + }, + /** Creates a new [[Param]] from a url PATH */ + fromPath: function (id, type, config) { + return new Param(id, type, config, exports.DefType.PATH, _this); + }, + /** Creates a new [[Param]] from a url SEARCH */ + fromSearch: function (id, type, config) { + return new Param(id, type, config, exports.DefType.SEARCH, _this); + }, + }; + extend(this, { UrlMatcher: UrlMatcher, Param: Param }); + } + /** @inheritdoc */ + UrlMatcherFactory.prototype.caseInsensitive = function (value) { + return this._isCaseInsensitive = isDefined(value) ? value : this._isCaseInsensitive; + }; + /** @inheritdoc */ + UrlMatcherFactory.prototype.strictMode = function (value) { + return this._isStrictMode = isDefined(value) ? value : this._isStrictMode; + }; + /** @inheritdoc */ + UrlMatcherFactory.prototype.defaultSquashPolicy = function (value) { + if (isDefined(value) && value !== true && value !== false && !isString(value)) + throw new Error("Invalid squash policy: " + value + ". Valid policies: false, true, arbitrary-string"); + return this._defaultSquashPolicy = isDefined(value) ? value : this._defaultSquashPolicy; + }; + /** + * Creates a [[UrlMatcher]] for the specified pattern. + * + * @param pattern The URL pattern. + * @param config The config object hash. + * @returns The UrlMatcher. + */ + UrlMatcherFactory.prototype.compile = function (pattern, config) { + return new UrlMatcher(pattern, this.paramTypes, this.paramFactory, this._getConfig(config)); + }; + /** + * Returns true if the specified object is a [[UrlMatcher]], or false otherwise. + * + * @param object The object to perform the type check against. + * @returns `true` if the object matches the `UrlMatcher` interface, by + * implementing all the same methods. + */ + UrlMatcherFactory.prototype.isMatcher = function (object) { + // TODO: typeof? + if (!isObject(object)) + return false; + var result = true; + forEach(UrlMatcher.prototype, function (val, name) { + if (isFunction(val)) + result = result && (isDefined(object[name]) && isFunction(object[name])); + }); + return result; + }; + + /** + * Creates and registers a custom [[ParamType]] object + * + * A [[ParamType]] can be used to generate URLs with typed parameters. + * + * @param name The type name. + * @param definition The type definition. See [[ParamTypeDefinition]] for information on the values accepted. + * @param definitionFn A function that is injected before the app runtime starts. + * The result of this function should be a [[ParamTypeDefinition]]. + * The result is merged into the existing `definition`. + * See [[ParamType]] for information on the values accepted. + * + * @returns - if a type was registered: the [[UrlMatcherFactory]] + * - if only the `name` parameter was specified: the currently registered [[ParamType]] object, or undefined + * + * Note: Register custom types *before using them* in a state definition. + * + * See [[ParamTypeDefinition]] for examples + */ + UrlMatcherFactory.prototype.type = function (name, definition, definitionFn) { + var type = this.paramTypes.type(name, definition, definitionFn); + return !isDefined(definition) ? type : this; + }; + + /** @hidden */ + UrlMatcherFactory.prototype.$get = function () { + this.paramTypes.enqueue = false; + this.paramTypes._flushTypeQueue(); + return this; + }; + + /** @internalapi */ + UrlMatcherFactory.prototype.dispose = function () { + this.paramTypes.dispose(); + }; + return UrlMatcherFactory; +}()); + +/** + * @coreapi + * @module url + */ /** */ +/** + * Creates a [[UrlRule]] + * + * Creates a [[UrlRule]] from a: + * + * - `string` + * - [[UrlMatcher]] + * - `RegExp` + * - [[StateObject]] + * @internalapi + */ +var UrlRuleFactory = /** @class */ (function () { + function UrlRuleFactory(router) { + this.router = router; + } + UrlRuleFactory.prototype.compile = function (str) { + return this.router.urlMatcherFactory.compile(str); + }; + UrlRuleFactory.prototype.create = function (what, handler) { + var _this = this; + var makeRule = pattern([ + [isString, function (_what) { return makeRule(_this.compile(_what)); }], + [is(UrlMatcher), function (_what) { return _this.fromUrlMatcher(_what, handler); }], + [isState, function (_what) { return _this.fromState(_what, _this.router); }], + [is(RegExp), function (_what) { return _this.fromRegExp(_what, handler); }], + [isFunction, function (_what) { return new BaseUrlRule(_what, handler); }], + ]); + var rule = makeRule(what); + if (!rule) + throw new Error("invalid 'what' in when()"); + return rule; + }; + /** + * A UrlRule which matches based on a UrlMatcher + * + * The `handler` may be either a `string`, a [[UrlRuleHandlerFn]] or another [[UrlMatcher]] + * + * ## Handler as a function + * + * If `handler` is a function, the function is invoked with: + * + * - matched parameter values ([[RawParams]] from [[UrlMatcher.exec]]) + * - url: the current Url ([[UrlParts]]) + * - router: the router object ([[UIRouter]]) + * + * #### Example: + * ```js + * var urlMatcher = $umf.compile("/foo/:fooId/:barId"); + * var rule = factory.fromUrlMatcher(urlMatcher, match => "/home/" + match.fooId + "/" + match.barId); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); // '/home/123/456' + * ``` + * + * ## Handler as UrlMatcher + * + * If `handler` is a UrlMatcher, the handler matcher is used to create the new url. + * The `handler` UrlMatcher is formatted using the matched param from the first matcher. + * The url is replaced with the result. + * + * #### Example: + * ```js + * var urlMatcher = $umf.compile("/foo/:fooId/:barId"); + * var handler = $umf.compile("/home/:fooId/:barId"); + * var rule = factory.fromUrlMatcher(urlMatcher, handler); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); // '/home/123/456' + * ``` + */ + UrlRuleFactory.prototype.fromUrlMatcher = function (urlMatcher, handler) { + var _handler = handler; + if (isString(handler)) + handler = this.router.urlMatcherFactory.compile(handler); + if (is(UrlMatcher)(handler)) + _handler = function (match) { return handler.format(match); }; + function match(url) { + var match = urlMatcher.exec(url.path, url.search, url.hash); + return urlMatcher.validates(match) && match; + } + // Prioritize URLs, lowest to highest: + // - Some optional URL parameters, but none matched + // - No optional parameters in URL + // - Some optional parameters, some matched + // - Some optional parameters, all matched + function matchPriority(params) { + var optional = urlMatcher.parameters().filter(function (param) { return param.isOptional; }); + if (!optional.length) + return 0.000001; + var matched = optional.filter(function (param) { return params[param.id]; }); + return matched.length / optional.length; + } + var details = { urlMatcher: urlMatcher, matchPriority: matchPriority, type: "URLMATCHER" }; + return extend(new BaseUrlRule(match, _handler), details); + }; + /** + * A UrlRule which matches a state by its url + * + * #### Example: + * ```js + * var rule = factory.fromState($state.get('foo'), router); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); + * // Starts a transition to 'foo' with params: { fooId: '123', barId: '456' } + * ``` + */ + UrlRuleFactory.prototype.fromState = function (state, router) { + /** + * Handles match by transitioning to matched state + * + * First checks if the router should start a new transition. + * A new transition is not required if the current state's URL + * and the new URL are already identical + */ + var handler = function (match) { + var $state = router.stateService; + var globals = router.globals; + if ($state.href(state, match) !== $state.href(globals.current, globals.params)) { + $state.transitionTo(state, match, { inherit: true, source: "url" }); + } + }; + var details = { state: state, type: "STATE" }; + return extend(this.fromUrlMatcher(state.url, handler), details); + }; + /** + * A UrlRule which matches based on a regular expression + * + * The `handler` may be either a [[UrlRuleHandlerFn]] or a string. + * + * ## Handler as a function + * + * If `handler` is a function, the function is invoked with: + * + * - regexp match array (from `regexp`) + * - url: the current Url ([[UrlParts]]) + * - router: the router object ([[UIRouter]]) + * + * #### Example: + * ```js + * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, match => "/home/" + match[1]) + * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ] + * var result = rule.handler(match); // '/home/bar' + * ``` + * + * ## Handler as string + * + * If `handler` is a string, the url is *replaced by the string* when the Rule is invoked. + * The string is first interpolated using `string.replace()` style pattern. + * + * #### Example: + * ```js + * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, "/home/$1") + * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ] + * var result = rule.handler(match); // '/home/bar' + * ``` + */ + UrlRuleFactory.prototype.fromRegExp = function (regexp, handler) { + if (regexp.global || regexp.sticky) + throw new Error("Rule RegExp must not be global or sticky"); + /** + * If handler is a string, the url will be replaced by the string. + * If the string has any String.replace() style variables in it (like `$2`), + * they will be replaced by the captures from [[match]] + */ + var redirectUrlTo = function (match) { + // Interpolates matched values into $1 $2, etc using a String.replace()-style pattern + return handler.replace(/\$(\$|\d{1,2})/, function (m, what) { + return match[what === '$' ? 0 : Number(what)]; + }); + }; + var _handler = isString(handler) ? redirectUrlTo : handler; + var match = function (url) { + return regexp.exec(url.path); + }; + var details = { regexp: regexp, type: "REGEXP" }; + return extend(new BaseUrlRule(match, _handler), details); + }; + UrlRuleFactory.isUrlRule = function (obj) { + return obj && ['type', 'match', 'handler'].every(function (key) { return isDefined(obj[key]); }); + }; + return UrlRuleFactory; +}()); +/** + * A base rule which calls `match` + * + * The value from the `match` function is passed through to the `handler`. + * @internalapi + */ +var BaseUrlRule = /** @class */ (function () { + function BaseUrlRule(match, handler) { + var _this = this; + this.match = match; + this.type = "RAW"; + this.matchPriority = function (match) { return 0 - _this.$id; }; + this.handler = handler || identity; + } + return BaseUrlRule; +}()); + +/** + * @internalapi + * @module url + */ +/** for typedoc */ +/** @hidden */ +function appendBasePath(url, isHtml5, absolute, baseHref) { + if (baseHref === '/') + return url; + if (isHtml5) + return stripFile(baseHref) + url; + if (absolute) + return baseHref.slice(1) + url; + return url; +} +/** @hidden */ +var prioritySort = function (a, b) { + return (b.priority || 0) - (a.priority || 0); +}; +/** @hidden */ +var typeSort = function (a, b) { + var weights = { "STATE": 4, "URLMATCHER": 4, "REGEXP": 3, "RAW": 2, "OTHER": 1 }; + return (weights[a.type] || 0) - (weights[b.type] || 0); +}; +/** @hidden */ +var urlMatcherSort = function (a, b) { + return !a.urlMatcher || !b.urlMatcher ? 0 : UrlMatcher.compare(a.urlMatcher, b.urlMatcher); +}; +/** @hidden */ +var idSort = function (a, b) { + // Identically sorted STATE and URLMATCHER best rule will be chosen by `matchPriority` after each rule matches the URL + var useMatchPriority = { STATE: true, URLMATCHER: true }; + var equal = useMatchPriority[a.type] && useMatchPriority[b.type]; + return equal ? 0 : (a.$id || 0) - (b.$id || 0); +}; +/** + * Default rule priority sorting function. + * + * Sorts rules by: + * + * - Explicit priority (set rule priority using [[UrlRulesApi.when]]) + * - Rule type (STATE: 4, URLMATCHER: 4, REGEXP: 3, RAW: 2, OTHER: 1) + * - `UrlMatcher` specificity ([[UrlMatcher.compare]]): works for STATE and URLMATCHER types to pick the most specific rule. + * - Rule registration order (for rule types other than STATE and URLMATCHER) + * - Equally sorted State and UrlMatcher rules will each match the URL. + * Then, the *best* match is chosen based on how many parameter values were matched. + * + * @coreapi + */ +var defaultRuleSortFn; +defaultRuleSortFn = function (a, b) { + var cmp = prioritySort(a, b); + if (cmp !== 0) + return cmp; + cmp = typeSort(a, b); + if (cmp !== 0) + return cmp; + cmp = urlMatcherSort(a, b); + if (cmp !== 0) + return cmp; + return idSort(a, b); +}; +/** + * Updates URL and responds to URL changes + * + * ### Deprecation warning: + * This class is now considered to be an internal API + * Use the [[UrlService]] instead. + * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]]. + * + * This class updates the URL when the state changes. + * It also responds to changes in the URL. + */ +var UrlRouter = /** @class */ (function () { + /** @hidden */ + function UrlRouter(router) { + /** @hidden */ this._sortFn = defaultRuleSortFn; + /** @hidden */ this._rules = []; + /** @hidden */ this.interceptDeferred = false; + /** @hidden */ this._id = 0; + /** @hidden */ this._sorted = false; + this._router = router; + this.urlRuleFactory = new UrlRuleFactory(router); + createProxyFunctions(val(UrlRouter.prototype), this, val(this)); + } + /** @internalapi */ + UrlRouter.prototype.dispose = function () { + this.listen(false); + this._rules = []; + delete this._otherwiseFn; + }; + /** @inheritdoc */ + UrlRouter.prototype.sort = function (compareFn) { + this._rules = this.stableSort(this._rules, this._sortFn = compareFn || this._sortFn); + this._sorted = true; + }; + UrlRouter.prototype.ensureSorted = function () { + this._sorted || this.sort(); + }; + UrlRouter.prototype.stableSort = function (arr, compareFn) { + var arrOfWrapper = arr.map(function (elem, idx) { return ({ elem: elem, idx: idx }); }); + arrOfWrapper.sort(function (wrapperA, wrapperB) { + var cmpDiff = compareFn(wrapperA.elem, wrapperB.elem); + return cmpDiff === 0 + ? wrapperA.idx - wrapperB.idx + : cmpDiff; + }); + return arrOfWrapper.map(function (wrapper) { return wrapper.elem; }); + }; + /** + * Given a URL, check all rules and return the best [[MatchResult]] + * @param url + * @returns {MatchResult} + */ + UrlRouter.prototype.match = function (url) { + var _this = this; + this.ensureSorted(); + url = extend({ path: '', search: {}, hash: '' }, url); + var rules = this.rules(); + if (this._otherwiseFn) + rules.push(this._otherwiseFn); + // Checks a single rule. Returns { rule: rule, match: match, weight: weight } if it matched, or undefined + var checkRule = function (rule) { + var match = rule.match(url, _this._router); + return match && { match: match, rule: rule, weight: rule.matchPriority(match) }; + }; + // The rules are pre-sorted. + // - Find the first matching rule. + // - Find any other matching rule that sorted *exactly the same*, according to `.sort()`. + // - Choose the rule with the highest match weight. + var best; + for (var i = 0; i < rules.length; i++) { + // Stop when there is a 'best' rule and the next rule sorts differently than it. + if (best && this._sortFn(rules[i], best.rule) !== 0) + break; + var current = checkRule(rules[i]); + // Pick the best MatchResult + best = (!best || current && current.weight > best.weight) ? current : best; + } + return best; + }; + /** @inheritdoc */ + UrlRouter.prototype.sync = function (evt) { + if (evt && evt.defaultPrevented) + return; + var router = this._router, $url = router.urlService, $state = router.stateService; + var url = { + path: $url.path(), search: $url.search(), hash: $url.hash(), + }; + var best = this.match(url); + var applyResult = pattern([ + [isString, function (newurl) { return $url.url(newurl, true); }], + [TargetState.isDef, function (def) { return $state.go(def.state, def.params, def.options); }], + [is(TargetState), function (target) { return $state.go(target.state(), target.params(), target.options()); }], + ]); + applyResult(best && best.rule.handler(best.match, url, router)); + }; + /** @inheritdoc */ + UrlRouter.prototype.listen = function (enabled) { + var _this = this; + if (enabled === false) { + this._stopFn && this._stopFn(); + delete this._stopFn; + } + else { + return this._stopFn = this._stopFn || this._router.urlService.onChange(function (evt) { return _this.sync(evt); }); + } + }; + /** + * Internal API. + * @internalapi + */ + UrlRouter.prototype.update = function (read) { + var $url = this._router.locationService; + if (read) { + this.location = $url.path(); + return; + } + if ($url.path() === this.location) + return; + $url.url(this.location, true); + }; + /** + * Internal API. + * + * Pushes a new location to the browser history. + * + * @internalapi + * @param urlMatcher + * @param params + * @param options + */ + UrlRouter.prototype.push = function (urlMatcher, params, options) { + var replace = options && !!options.replace; + this._router.urlService.url(urlMatcher.format(params || {}), replace); + }; + /** + * Builds and returns a URL with interpolated parameters + * + * #### Example: + * ```js + * matcher = $umf.compile("/about/:person"); + * params = { person: "bob" }; + * $bob = $urlRouter.href(matcher, params); + * // $bob == "/about/bob"; + * ``` + * + * @param urlMatcher The [[UrlMatcher]] object which is used as the template of the URL to generate. + * @param params An object of parameter values to fill the matcher's required parameters. + * @param options Options object. The options are: + * + * - **`absolute`** - {boolean=false}, If true will generate an absolute url, e.g. "http://www.example.com/fullurl". + * + * @returns Returns the fully compiled URL, or `null` if `params` fail validation against `urlMatcher` + */ + UrlRouter.prototype.href = function (urlMatcher, params, options) { + var url = urlMatcher.format(params); + if (url == null) + return null; + options = options || { absolute: false }; + var cfg = this._router.urlService.config; + var isHtml5 = cfg.html5Mode(); + if (!isHtml5 && url !== null) { + url = "#" + cfg.hashPrefix() + url; + } + url = appendBasePath(url, isHtml5, options.absolute, cfg.baseHref()); + if (!options.absolute || !url) { + return url; + } + var slash = (!isHtml5 && url ? '/' : ''), port = cfg.port(); + port = (port === 80 || port === 443 ? '' : ':' + port); + return [cfg.protocol(), '://', cfg.host(), port, slash, url].join(''); + }; + /** + * Manually adds a URL Rule. + * + * Usually, a url rule is added using [[StateDeclaration.url]] or [[when]]. + * This api can be used directly for more control (to register a [[BaseUrlRule]], for example). + * Rules can be created using [[UrlRouter.urlRuleFactory]], or create manually as simple objects. + * + * A rule should have a `match` function which returns truthy if the rule matched. + * It should also have a `handler` function which is invoked if the rule is the best match. + * + * @return a function that deregisters the rule + */ + UrlRouter.prototype.rule = function (rule) { + var _this = this; + if (!UrlRuleFactory.isUrlRule(rule)) + throw new Error("invalid rule"); + rule.$id = this._id++; + rule.priority = rule.priority || 0; + this._rules.push(rule); + this._sorted = false; + return function () { return _this.removeRule(rule); }; + }; + /** @inheritdoc */ + UrlRouter.prototype.removeRule = function (rule) { + removeFrom(this._rules, rule); + }; + /** @inheritdoc */ + UrlRouter.prototype.rules = function () { + this.ensureSorted(); + return this._rules.slice(); + }; + /** @inheritdoc */ + UrlRouter.prototype.otherwise = function (handler) { + var handlerFn = getHandlerFn(handler); + this._otherwiseFn = this.urlRuleFactory.create(val(true), handlerFn); + this._sorted = false; + }; + + /** @inheritdoc */ + UrlRouter.prototype.initial = function (handler) { + var handlerFn = getHandlerFn(handler); + var matchFn = function (urlParts, router) { + return router.globals.transitionHistory.size() === 0 && !!/^\/?$/.exec(urlParts.path); + }; + this.rule(this.urlRuleFactory.create(matchFn, handlerFn)); + }; + + /** @inheritdoc */ + UrlRouter.prototype.when = function (matcher, handler, options) { + var rule = this.urlRuleFactory.create(matcher, handler); + if (isDefined(options && options.priority)) + rule.priority = options.priority; + this.rule(rule); + return rule; + }; + + /** @inheritdoc */ + UrlRouter.prototype.deferIntercept = function (defer) { + if (defer === undefined) + defer = true; + this.interceptDeferred = defer; + }; + + return UrlRouter; +}()); +function getHandlerFn(handler) { + if (!isFunction(handler) && !isString(handler) && !is(TargetState)(handler) && !TargetState.isDef(handler)) { + throw new Error("'handler' must be a string, function, TargetState, or have a state: 'newtarget' property"); + } + return isFunction(handler) ? handler : val(handler); +} + +/** + * @coreapi + * @module view + */ /** for typedoc */ +/** + * The View service + * + * This service pairs existing `ui-view` components (which live in the DOM) + * with view configs (from the state declaration objects: [[StateDeclaration.views]]). + * + * - After a successful Transition, the views from the newly entered states are activated via [[activateViewConfig]]. + * The views from exited states are deactivated via [[deactivateViewConfig]]. + * (See: the [[registerActivateViews]] Transition Hook) + * + * - As `ui-view` components pop in and out of existence, they register themselves using [[registerUIView]]. + * + * - When the [[sync]] function is called, the registered `ui-view`(s) ([[ActiveUIView]]) + * are configured with the matching [[ViewConfig]](s) + * + */ +var ViewService = /** @class */ (function () { + function ViewService() { + var _this = this; + this._uiViews = []; + this._viewConfigs = []; + this._viewConfigFactories = {}; + this._pluginapi = { + _rootViewContext: this._rootViewContext.bind(this), + _viewConfigFactory: this._viewConfigFactory.bind(this), + _registeredUIViews: function () { return _this._uiViews; }, + _activeViewConfigs: function () { return _this._viewConfigs; }, + }; + } + ViewService.prototype._rootViewContext = function (context) { + return this._rootContext = context || this._rootContext; + }; + + ViewService.prototype._viewConfigFactory = function (viewType, factory) { + this._viewConfigFactories[viewType] = factory; + }; + ViewService.prototype.createViewConfig = function (path, decl) { + var cfgFactory = this._viewConfigFactories[decl.$type]; + if (!cfgFactory) + throw new Error("ViewService: No view config factory registered for type " + decl.$type); + var cfgs = cfgFactory(path, decl); + return isArray(cfgs) ? cfgs : [cfgs]; + }; + /** + * Deactivates a ViewConfig. + * + * This function deactivates a `ViewConfig`. + * After calling [[sync]], it will un-pair from any `ui-view` with which it is currently paired. + * + * @param viewConfig The ViewConfig view to deregister. + */ + ViewService.prototype.deactivateViewConfig = function (viewConfig) { + trace.traceViewServiceEvent("<- Removing", viewConfig); + removeFrom(this._viewConfigs, viewConfig); + }; + ViewService.prototype.activateViewConfig = function (viewConfig) { + trace.traceViewServiceEvent("-> Registering", viewConfig); + this._viewConfigs.push(viewConfig); + }; + ViewService.prototype.sync = function () { + var _this = this; + var uiViewsByFqn = this._uiViews.map(function (uiv) { return [uiv.fqn, uiv]; }).reduce(applyPairs, {}); + // Return a weighted depth value for a uiView. + // The depth is the nesting depth of ui-views (based on FQN; times 10,000) + // plus the depth of the state that is populating the uiView + function uiViewDepth(uiView) { + var stateDepth = function (context) { + return context && context.parent ? stateDepth(context.parent) + 1 : 1; + }; + return (uiView.fqn.split(".").length * 10000) + stateDepth(uiView.creationContext); + } + // Return the ViewConfig's context's depth in the context tree. + function viewConfigDepth(config) { + var context = config.viewDecl.$context, count = 0; + while (++count && context.parent) + context = context.parent; + return count; + } + // Given a depth function, returns a compare function which can return either ascending or descending order + var depthCompare = curry(function (depthFn, posNeg, left, right) { return posNeg * (depthFn(left) - depthFn(right)); }); + var matchingConfigPair = function (uiView) { + var matchingConfigs = _this._viewConfigs.filter(ViewService.matches(uiViewsByFqn, uiView)); + if (matchingConfigs.length > 1) { + // This is OK. Child states can target a ui-view that the parent state also targets (the child wins) + // Sort by depth and return the match from the deepest child + // console.log(`Multiple matching view configs for ${uiView.fqn}`, matchingConfigs); + matchingConfigs.sort(depthCompare(viewConfigDepth, -1)); // descending + } + return [uiView, matchingConfigs[0]]; + }; + var configureUIView = function (_a) { + var uiView = _a[0], viewConfig = _a[1]; + // If a parent ui-view is reconfigured, it could destroy child ui-views. + // Before configuring a child ui-view, make sure it's still in the active uiViews array. + if (_this._uiViews.indexOf(uiView) !== -1) + uiView.configUpdated(viewConfig); + }; + // Sort views by FQN and state depth. Process uiviews nearest the root first. + var pairs$$1 = this._uiViews.sort(depthCompare(uiViewDepth, 1)).map(matchingConfigPair); + trace.traceViewSync(pairs$$1); + pairs$$1.forEach(configureUIView); + }; + + /** + * Registers a `ui-view` component + * + * When a `ui-view` component is created, it uses this method to register itself. + * After registration the [[sync]] method is used to ensure all `ui-view` are configured with the proper [[ViewConfig]]. + * + * Note: the `ui-view` component uses the `ViewConfig` to determine what view should be loaded inside the `ui-view`, + * and what the view's state context is. + * + * Note: There is no corresponding `deregisterUIView`. + * A `ui-view` should hang on to the return value of `registerUIView` and invoke it to deregister itself. + * + * @param uiView The metadata for a UIView + * @return a de-registration function used when the view is destroyed. + */ + ViewService.prototype.registerUIView = function (uiView) { + trace.traceViewServiceUIViewEvent("-> Registering", uiView); + var uiViews = this._uiViews; + var fqnAndTypeMatches = function (uiv) { return uiv.fqn === uiView.fqn && uiv.$type === uiView.$type; }; + if (uiViews.filter(fqnAndTypeMatches).length) + trace.traceViewServiceUIViewEvent("!!!! duplicate uiView named:", uiView); + uiViews.push(uiView); + this.sync(); + return function () { + var idx = uiViews.indexOf(uiView); + if (idx === -1) { + trace.traceViewServiceUIViewEvent("Tried removing non-registered uiView", uiView); + return; + } + trace.traceViewServiceUIViewEvent("<- Deregistering", uiView); + removeFrom(uiViews)(uiView); + }; + }; + + /** + * Returns the list of views currently available on the page, by fully-qualified name. + * + * @return {Array} Returns an array of fully-qualified view names. + */ + ViewService.prototype.available = function () { + return this._uiViews.map(prop("fqn")); + }; + /** + * Returns the list of views on the page containing loaded content. + * + * @return {Array} Returns an array of fully-qualified view names. + */ + ViewService.prototype.active = function () { + return this._uiViews.filter(prop("$config")).map(prop("name")); + }; + /** + * Normalizes a view's name from a state.views configuration block. + * + * This should be used by a framework implementation to calculate the values for + * [[_ViewDeclaration.$uiViewName]] and [[_ViewDeclaration.$uiViewContextAnchor]]. + * + * @param context the context object (state declaration) that the view belongs to + * @param rawViewName the name of the view, as declared in the [[StateDeclaration.views]] + * + * @returns the normalized uiViewName and uiViewContextAnchor that the view targets + */ + ViewService.normalizeUIViewTarget = function (context, rawViewName) { + if (rawViewName === void 0) { rawViewName = ""; } + // TODO: Validate incoming view name with a regexp to allow: + // ex: "view.name@foo.bar" , "^.^.view.name" , "view.name@^.^" , "" , + // "@" , "$default@^" , "!$default.$default" , "!foo.bar" + var viewAtContext = rawViewName.split("@"); + var uiViewName = viewAtContext[0] || "$default"; // default to unnamed view + var uiViewContextAnchor = isString(viewAtContext[1]) ? viewAtContext[1] : "^"; // default to parent context + // Handle relative view-name sugar syntax. + // Matches rawViewName "^.^.^.foo.bar" into array: ["^.^.^.foo.bar", "^.^.^", "foo.bar"], + var relativeViewNameSugar = /^(\^(?:\.\^)*)\.(.*$)/.exec(uiViewName); + if (relativeViewNameSugar) { + // Clobbers existing contextAnchor (rawViewName validation will fix this) + uiViewContextAnchor = relativeViewNameSugar[1]; // set anchor to "^.^.^" + uiViewName = relativeViewNameSugar[2]; // set view-name to "foo.bar" + } + if (uiViewName.charAt(0) === '!') { + uiViewName = uiViewName.substr(1); + uiViewContextAnchor = ""; // target absolutely from root + } + // handle parent relative targeting "^.^.^" + var relativeMatch = /^(\^(?:\.\^)*)$/; + if (relativeMatch.exec(uiViewContextAnchor)) { + var anchor = uiViewContextAnchor.split(".").reduce((function (anchor, x) { return anchor.parent; }), context); + uiViewContextAnchor = anchor.name; + } + else if (uiViewContextAnchor === '.') { + uiViewContextAnchor = context.name; + } + return { uiViewName: uiViewName, uiViewContextAnchor: uiViewContextAnchor }; + }; + /** + * Given a ui-view and a ViewConfig, determines if they "match". + * + * A ui-view has a fully qualified name (fqn) and a context object. The fqn is built from its overall location in + * the DOM, describing its nesting relationship to any parent ui-view tags it is nested inside of. + * + * A ViewConfig has a target ui-view name and a context anchor. The ui-view name can be a simple name, or + * can be a segmented ui-view path, describing a portion of a ui-view fqn. + * + * In order for a ui-view to match ViewConfig, ui-view's $type must match the ViewConfig's $type + * + * If the ViewConfig's target ui-view name is a simple name (no dots), then a ui-view matches if: + * - the ui-view's name matches the ViewConfig's target name + * - the ui-view's context matches the ViewConfig's anchor + * + * If the ViewConfig's target ui-view name is a segmented name (with dots), then a ui-view matches if: + * - There exists a parent ui-view where: + * - the parent ui-view's name matches the first segment (index 0) of the ViewConfig's target name + * - the parent ui-view's context matches the ViewConfig's anchor + * - And the remaining segments (index 1..n) of the ViewConfig's target name match the tail of the ui-view's fqn + * + * Example: + * + * DOM: + * + * + * + * + * + * + * + * + * + * uiViews: [ + * { fqn: "$default", creationContext: { name: "" } }, + * { fqn: "$default.foo", creationContext: { name: "A" } }, + * { fqn: "$default.foo.$default", creationContext: { name: "A.B" } } + * { fqn: "$default.foo.$default.bar", creationContext: { name: "A.B.C" } } + * ] + * + * These four view configs all match the ui-view with the fqn: "$default.foo.$default.bar": + * + * - ViewConfig1: { uiViewName: "bar", uiViewContextAnchor: "A.B.C" } + * - ViewConfig2: { uiViewName: "$default.bar", uiViewContextAnchor: "A.B" } + * - ViewConfig3: { uiViewName: "foo.$default.bar", uiViewContextAnchor: "A" } + * - ViewConfig4: { uiViewName: "$default.foo.$default.bar", uiViewContextAnchor: "" } + * + * Using ViewConfig3 as an example, it matches the ui-view with fqn "$default.foo.$default.bar" because: + * - The ViewConfig's segmented target name is: [ "foo", "$default", "bar" ] + * - There exists a parent ui-view (which has fqn: "$default.foo") where: + * - the parent ui-view's name "foo" matches the first segment "foo" of the ViewConfig's target name + * - the parent ui-view's context "A" matches the ViewConfig's anchor context "A" + * - And the remaining segments [ "$default", "bar" ].join("."_ of the ViewConfig's target name match + * the tail of the ui-view's fqn "default.bar" + * + * @internalapi + */ + ViewService.matches = function (uiViewsByFqn, uiView) { return function (viewConfig) { + // Don't supply an ng1 ui-view with an ng2 ViewConfig, etc + if (uiView.$type !== viewConfig.viewDecl.$type) + return false; + // Split names apart from both viewConfig and uiView into segments + var vc = viewConfig.viewDecl; + var vcSegments = vc.$uiViewName.split("."); + var uivSegments = uiView.fqn.split("."); + // Check if the tails of the segment arrays match. ex, these arrays' tails match: + // vc: ["foo", "bar"], uiv fqn: ["$default", "foo", "bar"] + if (!equals(vcSegments, uivSegments.slice(0 - vcSegments.length))) + return false; + // Now check if the fqn ending at the first segment of the viewConfig matches the context: + // ["$default", "foo"].join(".") == "$default.foo", does the ui-view $default.foo context match? + var negOffset = (1 - vcSegments.length) || undefined; + var fqnToFirstSegment = uivSegments.slice(0, negOffset).join("."); + var uiViewContext = uiViewsByFqn[fqnToFirstSegment].creationContext; + return vc.$uiViewContextAnchor === (uiViewContext && uiViewContext.name); + }; }; + return ViewService; +}()); + +/** + * @coreapi + * @module core + */ /** */ +/** + * Global router state + * + * This is where we hold the global mutable state such as current state, current + * params, current transition, etc. + */ +var UIRouterGlobals = /** @class */ (function () { + function UIRouterGlobals() { + /** + * Current parameter values + * + * The parameter values from the latest successful transition + */ + this.params = new StateParams(); + /** @internalapi */ + this.lastStartedTransitionId = -1; + /** @internalapi */ + this.transitionHistory = new Queue([], 1); + /** @internalapi */ + this.successfulTransitions = new Queue([], 1); + } + UIRouterGlobals.prototype.dispose = function () { + this.transitionHistory.clear(); + this.successfulTransitions.clear(); + this.transition = null; + }; + return UIRouterGlobals; +}()); + +/** + * @coreapi + * @module url + */ /** */ +/** @hidden */ +var makeStub = function (keys) { + return keys.reduce(function (acc, key) { return (acc[key] = notImplemented(key), acc); }, { dispose: noop$1 }); +}; +/** @hidden */ var locationServicesFns = ["url", "path", "search", "hash", "onChange"]; +/** @hidden */ var locationConfigFns = ["port", "protocol", "host", "baseHref", "html5Mode", "hashPrefix"]; +/** @hidden */ var umfFns = ["type", "caseInsensitive", "strictMode", "defaultSquashPolicy"]; +/** @hidden */ var rulesFns = ["sort", "when", "initial", "otherwise", "rules", "rule", "removeRule"]; +/** @hidden */ var syncFns = ["deferIntercept", "listen", "sync", "match"]; +/** + * API for URL management + */ +var UrlService = /** @class */ (function () { + /** @hidden */ + function UrlService(router, lateBind) { + if (lateBind === void 0) { lateBind = true; } + this.router = router; + this.rules = {}; + this.config = {}; + // proxy function calls from UrlService to the LocationService/LocationConfig + var locationServices = function () { return router.locationService; }; + createProxyFunctions(locationServices, this, locationServices, locationServicesFns, lateBind); + var locationConfig = function () { return router.locationConfig; }; + createProxyFunctions(locationConfig, this.config, locationConfig, locationConfigFns, lateBind); + var umf = function () { return router.urlMatcherFactory; }; + createProxyFunctions(umf, this.config, umf, umfFns); + var urlRouter = function () { return router.urlRouter; }; + createProxyFunctions(urlRouter, this.rules, urlRouter, rulesFns); + createProxyFunctions(urlRouter, this, urlRouter, syncFns); + } + UrlService.prototype.url = function (newurl, replace, state) { return; }; + + /** @inheritdoc */ + UrlService.prototype.path = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.search = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.hash = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.onChange = function (callback) { return; }; + + /** + * Returns the current URL parts + * + * This method returns the current URL components as a [[UrlParts]] object. + * + * @returns the current url parts + */ + UrlService.prototype.parts = function () { + return { path: this.path(), search: this.search(), hash: this.hash() }; + }; + UrlService.prototype.dispose = function () { }; + /** @inheritdoc */ + UrlService.prototype.sync = function (evt) { return; }; + /** @inheritdoc */ + UrlService.prototype.listen = function (enabled) { return; }; + + /** @inheritdoc */ + UrlService.prototype.deferIntercept = function (defer) { return; }; + /** @inheritdoc */ + UrlService.prototype.match = function (urlParts) { return; }; + /** @hidden */ + UrlService.locationServiceStub = makeStub(locationServicesFns); + /** @hidden */ + UrlService.locationConfigStub = makeStub(locationConfigFns); + return UrlService; +}()); + +/** + * @coreapi + * @module core + */ /** */ +/** @hidden */ +var _routerInstance = 0; +/** + * The master class used to instantiate an instance of UI-Router. + * + * UI-Router (for each specific framework) will create an instance of this class during bootstrap. + * This class instantiates and wires the UI-Router services together. + * + * After a new instance of the UIRouter class is created, it should be configured for your app. + * For instance, app states should be registered with the [[UIRouter.stateRegistry]]. + * + * --- + * + * Normally the framework code will bootstrap UI-Router. + * If you are bootstrapping UIRouter manually, tell it to monitor the URL by calling + * [[UrlService.listen]] then [[UrlService.sync]]. + */ +var UIRouter = /** @class */ (function () { + /** + * Creates a new `UIRouter` object + * + * @param locationService a [[LocationServices]] implementation + * @param locationConfig a [[LocationConfig]] implementation + * @internalapi + */ + function UIRouter(locationService, locationConfig) { + if (locationService === void 0) { locationService = UrlService.locationServiceStub; } + if (locationConfig === void 0) { locationConfig = UrlService.locationConfigStub; } + this.locationService = locationService; + this.locationConfig = locationConfig; + /** @hidden */ this.$id = _routerInstance++; + /** @hidden */ this._disposed = false; + /** @hidden */ this._disposables = []; + /** Provides trace information to the console */ + this.trace = trace; + /** Provides services related to ui-view synchronization */ + this.viewService = new ViewService(); + /** Provides services related to Transitions */ + this.transitionService = new TransitionService(this); + /** Global router state */ + this.globals = new UIRouterGlobals(); + /** + * Deprecated for public use. Use [[urlService]] instead. + * @deprecated Use [[urlService]] instead + */ + this.urlMatcherFactory = new UrlMatcherFactory(); + /** + * Deprecated for public use. Use [[urlService]] instead. + * @deprecated Use [[urlService]] instead + */ + this.urlRouter = new UrlRouter(this); + /** Provides a registry for states, and related registration services */ + this.stateRegistry = new StateRegistry(this); + /** Provides services related to states */ + this.stateService = new StateService(this); + /** Provides services related to the URL */ + this.urlService = new UrlService(this); + /** @hidden */ + this._plugins = {}; + this.viewService._pluginapi._rootViewContext(this.stateRegistry.root()); + this.globals.$current = this.stateRegistry.root(); + this.globals.current = this.globals.$current.self; + this.disposable(this.globals); + this.disposable(this.stateService); + this.disposable(this.stateRegistry); + this.disposable(this.transitionService); + this.disposable(this.urlRouter); + this.disposable(locationService); + this.disposable(locationConfig); + } + /** Registers an object to be notified when the router is disposed */ + UIRouter.prototype.disposable = function (disposable) { + this._disposables.push(disposable); + }; + /** + * Disposes this router instance + * + * When called, clears resources retained by the router by calling `dispose(this)` on all + * registered [[disposable]] objects. + * + * Or, if a `disposable` object is provided, calls `dispose(this)` on that object only. + * + * @param disposable (optional) the disposable to dispose + */ + UIRouter.prototype.dispose = function (disposable) { + var _this = this; + if (disposable && isFunction(disposable.dispose)) { + disposable.dispose(this); + return undefined; + } + this._disposed = true; + this._disposables.slice().forEach(function (d) { + try { + typeof d.dispose === 'function' && d.dispose(_this); + removeFrom(_this._disposables, d); + } + catch (ignored) { } + }); + }; + /** + * Adds a plugin to UI-Router + * + * This method adds a UI-Router Plugin. + * A plugin can enhance or change UI-Router behavior using any public API. + * + * #### Example: + * ```js + * import { MyCoolPlugin } from "ui-router-cool-plugin"; + * + * var plugin = router.addPlugin(MyCoolPlugin); + * ``` + * + * ### Plugin authoring + * + * A plugin is simply a class (or constructor function) which accepts a [[UIRouter]] instance and (optionally) an options object. + * + * The plugin can implement its functionality using any of the public APIs of [[UIRouter]]. + * For example, it may configure router options or add a Transition Hook. + * + * The plugin can then be published as a separate module. + * + * #### Example: + * ```js + * export class MyAuthPlugin implements UIRouterPlugin { + * constructor(router: UIRouter, options: any) { + * this.name = "MyAuthPlugin"; + * let $transitions = router.transitionService; + * let $state = router.stateService; + * + * let authCriteria = { + * to: (state) => state.data && state.data.requiresAuth + * }; + * + * function authHook(transition: Transition) { + * let authService = transition.injector().get('AuthService'); + * if (!authService.isAuthenticated()) { + * return $state.target('login'); + * } + * } + * + * $transitions.onStart(authCriteria, authHook); + * } + * } + * ``` + * + * @param plugin one of: + * - a plugin class which implements [[UIRouterPlugin]] + * - a constructor function for a [[UIRouterPlugin]] which accepts a [[UIRouter]] instance + * - a factory function which accepts a [[UIRouter]] instance and returns a [[UIRouterPlugin]] instance + * @param options options to pass to the plugin class/factory + * @returns the registered plugin instance + */ + UIRouter.prototype.plugin = function (plugin, options) { + if (options === void 0) { options = {}; } + var pluginInstance = new plugin(this, options); + if (!pluginInstance.name) + throw new Error("Required property `name` missing on plugin: " + pluginInstance); + this._disposables.push(pluginInstance); + return this._plugins[pluginInstance.name] = pluginInstance; + }; + UIRouter.prototype.getPlugin = function (pluginName) { + return pluginName ? this._plugins[pluginName] : values(this._plugins); + }; + return UIRouter; +}()); + +/** @module hooks */ /** */ +function addCoreResolvables(trans) { + trans.addResolvable({ token: UIRouter, deps: [], resolveFn: function () { return trans.router; }, data: trans.router }, ""); + trans.addResolvable({ token: Transition, deps: [], resolveFn: function () { return trans; }, data: trans }, ""); + trans.addResolvable({ token: '$transition$', deps: [], resolveFn: function () { return trans; }, data: trans }, ""); + trans.addResolvable({ token: '$stateParams', deps: [], resolveFn: function () { return trans.params(); }, data: trans.params() }, ""); + trans.entering().forEach(function (state) { + trans.addResolvable({ token: '$state$', deps: [], resolveFn: function () { return state; }, data: state }, state); + }); +} +var registerAddCoreResolvables = function (transitionService) { + return transitionService.onCreate({}, addCoreResolvables); +}; + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that redirects to a different state or params + * + * Registered using `transitionService.onStart({ to: (state) => !!state.redirectTo }, redirectHook);` + * + * See [[StateDeclaration.redirectTo]] + */ +var redirectToHook = function (trans) { + var redirect = trans.to().redirectTo; + if (!redirect) + return; + var $state = trans.router.stateService; + function handleResult(result) { + if (!result) + return; + if (result instanceof TargetState) + return result; + if (isString(result)) + return $state.target(result, trans.params(), trans.options()); + if (result['state'] || result['params']) + return $state.target(result['state'] || trans.to(), result['params'] || trans.params(), trans.options()); + } + if (isFunction(redirect)) { + return services.$q.when(redirect(trans)).then(handleResult); + } + return handleResult(redirect); +}; +var registerRedirectToHook = function (transitionService) { + return transitionService.onStart({ to: function (state) { return !!state.redirectTo; } }, redirectToHook); +}; + +/** + * A factory which creates an onEnter, onExit or onRetain transition hook function + * + * The returned function invokes the (for instance) state.onEnter hook when the + * state is being entered. + * + * @hidden + */ +function makeEnterExitRetainHook(hookName) { + return function (transition, state) { + var _state = state.$$state(); + var hookFn = _state[hookName]; + return hookFn(transition, state); + }; +} +/** + * The [[TransitionStateHookFn]] for onExit + * + * When the state is being exited, the state's .onExit function is invoked. + * + * Registered using `transitionService.onExit({ exiting: (state) => !!state.onExit }, onExitHook);` + * + * See: [[IHookRegistry.onExit]] + */ +var onExitHook = makeEnterExitRetainHook('onExit'); +var registerOnExitHook = function (transitionService) { + return transitionService.onExit({ exiting: function (state) { return !!state.onExit; } }, onExitHook); +}; +/** + * The [[TransitionStateHookFn]] for onRetain + * + * When the state was already entered, and is not being exited or re-entered, the state's .onRetain function is invoked. + * + * Registered using `transitionService.onRetain({ retained: (state) => !!state.onRetain }, onRetainHook);` + * + * See: [[IHookRegistry.onRetain]] + */ +var onRetainHook = makeEnterExitRetainHook('onRetain'); +var registerOnRetainHook = function (transitionService) { + return transitionService.onRetain({ retained: function (state) { return !!state.onRetain; } }, onRetainHook); +}; +/** + * The [[TransitionStateHookFn]] for onEnter + * + * When the state is being entered, the state's .onEnter function is invoked. + * + * Registered using `transitionService.onEnter({ entering: (state) => !!state.onEnter }, onEnterHook);` + * + * See: [[IHookRegistry.onEnter]] + */ +var onEnterHook = makeEnterExitRetainHook('onEnter'); +var registerOnEnterHook = function (transitionService) { + return transitionService.onEnter({ entering: function (state) { return !!state.onEnter; } }, onEnterHook); +}; + +/** @module hooks */ +/** for typedoc */ +/** + * A [[TransitionHookFn]] which resolves all EAGER Resolvables in the To Path + * + * Registered using `transitionService.onStart({}, eagerResolvePath);` + * + * When a Transition starts, this hook resolves all the EAGER Resolvables, which the transition then waits for. + * + * See [[StateDeclaration.resolve]] + */ +var eagerResolvePath = function (trans) { + return new ResolveContext(trans.treeChanges().to) + .resolvePath("EAGER", trans) + .then(noop$1); +}; +var registerEagerResolvePath = function (transitionService) { + return transitionService.onStart({}, eagerResolvePath, { priority: 1000 }); +}; +/** + * A [[TransitionHookFn]] which resolves all LAZY Resolvables for the state (and all its ancestors) in the To Path + * + * Registered using `transitionService.onEnter({ entering: () => true }, lazyResolveState);` + * + * When a State is being entered, this hook resolves all the Resolvables for this state, which the transition then waits for. + * + * See [[StateDeclaration.resolve]] + */ +var lazyResolveState = function (trans, state) { + return new ResolveContext(trans.treeChanges().to) + .subContext(state.$$state()) + .resolvePath("LAZY", trans) + .then(noop$1); +}; +var registerLazyResolveState = function (transitionService) { + return transitionService.onEnter({ entering: val(true) }, lazyResolveState, { priority: 1000 }); +}; + +/** @module hooks */ /** for typedoc */ +/** + * A [[TransitionHookFn]] which waits for the views to load + * + * Registered using `transitionService.onStart({}, loadEnteringViews);` + * + * Allows the views to do async work in [[ViewConfig.load]] before the transition continues. + * In angular 1, this includes loading the templates. + */ +var loadEnteringViews = function (transition) { + var $q = services.$q; + var enteringViews = transition.views("entering"); + if (!enteringViews.length) + return; + return $q.all(enteringViews.map(function (view) { return $q.when(view.load()); })).then(noop$1); +}; +var registerLoadEnteringViews = function (transitionService) { + return transitionService.onFinish({}, loadEnteringViews); +}; +/** + * A [[TransitionHookFn]] which activates the new views when a transition is successful. + * + * Registered using `transitionService.onSuccess({}, activateViews);` + * + * After a transition is complete, this hook deactivates the old views from the previous state, + * and activates the new views from the destination state. + * + * See [[ViewService]] + */ +var activateViews = function (transition) { + var enteringViews = transition.views("entering"); + var exitingViews = transition.views("exiting"); + if (!enteringViews.length && !exitingViews.length) + return; + var $view = transition.router.viewService; + exitingViews.forEach(function (vc) { return $view.deactivateViewConfig(vc); }); + enteringViews.forEach(function (vc) { return $view.activateViewConfig(vc); }); + $view.sync(); +}; +var registerActivateViews = function (transitionService) { + return transitionService.onSuccess({}, activateViews); +}; + +/** + * A [[TransitionHookFn]] which updates global UI-Router state + * + * Registered using `transitionService.onBefore({}, updateGlobalState);` + * + * Before a [[Transition]] starts, updates the global value of "the current transition" ([[Globals.transition]]). + * After a successful [[Transition]], updates the global values of "the current state" + * ([[Globals.current]] and [[Globals.$current]]) and "the current param values" ([[Globals.params]]). + * + * See also the deprecated properties: + * [[StateService.transition]], [[StateService.current]], [[StateService.params]] + */ +var updateGlobalState = function (trans) { + var globals = trans.router.globals; + var transitionSuccessful = function () { + globals.successfulTransitions.enqueue(trans); + globals.$current = trans.$to(); + globals.current = globals.$current.self; + copy(trans.params(), globals.params); + }; + var clearCurrentTransition = function () { + // Do not clear globals.transition if a different transition has started in the meantime + if (globals.transition === trans) + globals.transition = null; + }; + trans.onSuccess({}, transitionSuccessful, { priority: 10000 }); + trans.promise.then(clearCurrentTransition, clearCurrentTransition); +}; +var registerUpdateGlobalState = function (transitionService) { + return transitionService.onCreate({}, updateGlobalState); +}; + +/** + * A [[TransitionHookFn]] which updates the URL after a successful transition + * + * Registered using `transitionService.onSuccess({}, updateUrl);` + */ +var updateUrl = function (transition) { + var options = transition.options(); + var $state = transition.router.stateService; + var $urlRouter = transition.router.urlRouter; + // Dont update the url in these situations: + // The transition was triggered by a URL sync (options.source === 'url') + // The user doesn't want the url to update (options.location === false) + // The destination state, and all parents have no navigable url + if (options.source !== 'url' && options.location && $state.$current.navigable) { + var urlOptions = { replace: options.location === 'replace' }; + $urlRouter.push($state.$current.navigable.url, $state.params, urlOptions); + } + $urlRouter.update(true); +}; +var registerUpdateUrl = function (transitionService) { + return transitionService.onSuccess({}, updateUrl, { priority: 9999 }); +}; + +/** + * A [[TransitionHookFn]] that performs lazy loading + * + * When entering a state "abc" which has a `lazyLoad` function defined: + * - Invoke the `lazyLoad` function (unless it is already in process) + * - Flag the hook function as "in process" + * - The function should return a promise (that resolves when lazy loading is complete) + * - Wait for the promise to settle + * - If the promise resolves to a [[LazyLoadResult]], then register those states + * - Flag the hook function as "not in process" + * - If the hook was successful + * - Remove the `lazyLoad` function from the state declaration + * - If all the hooks were successful + * - Retry the transition (by returning a TargetState) + * + * ``` + * .state('abc', { + * component: 'fooComponent', + * lazyLoad: () => System.import('./fooComponent') + * }); + * ``` + * + * See [[StateDeclaration.lazyLoad]] + */ +var lazyLoadHook = function (transition) { + var router = transition.router; + function retryTransition() { + if (transition.originalTransition().options().source !== 'url') { + // The original transition was not triggered via url sync + // The lazy state should be loaded now, so re-try the original transition + var orig = transition.targetState(); + return router.stateService.target(orig.identifier(), orig.params(), orig.options()); + } + // The original transition was triggered via url sync + // Run the URL rules and find the best match + var $url = router.urlService; + var result = $url.match($url.parts()); + var rule = result && result.rule; + // If the best match is a state, redirect the transition (instead + // of calling sync() which supersedes the current transition) + if (rule && rule.type === "STATE") { + var state = rule.state; + var params = result.match; + return router.stateService.target(state, params, transition.options()); + } + // No matching state found, so let .sync() choose the best non-state match/otherwise + router.urlService.sync(); + } + var promises = transition.entering() + .filter(function (state) { return !!state.$$state().lazyLoad; }) + .map(function (state) { return lazyLoadState(transition, state); }); + return services.$q.all(promises).then(retryTransition); +}; +var registerLazyLoadHook = function (transitionService) { + return transitionService.onBefore({ entering: function (state) { return !!state.lazyLoad; } }, lazyLoadHook); +}; +/** + * Invokes a state's lazy load function + * + * @param transition a Transition context + * @param state the state to lazy load + * @returns A promise for the lazy load result + */ +function lazyLoadState(transition, state) { + var lazyLoadFn = state.$$state().lazyLoad; + // Store/get the lazy load promise on/from the hookfn so it doesn't get re-invoked + var promise = lazyLoadFn['_promise']; + if (!promise) { + var success = function (result) { + delete state.lazyLoad; + delete state.$$state().lazyLoad; + delete lazyLoadFn['_promise']; + return result; + }; + var error = function (err) { + delete lazyLoadFn['_promise']; + return services.$q.reject(err); + }; + promise = lazyLoadFn['_promise'] = + services.$q.when(lazyLoadFn(transition, state)) + .then(updateStateRegistry) + .then(success, error); + } + /** Register any lazy loaded state definitions */ + function updateStateRegistry(result) { + if (result && Array.isArray(result.states)) { + result.states.forEach(function (state) { return transition.router.stateRegistry.register(state); }); + } + return result; + } + return promise; +} + +/** + * This class defines a type of hook, such as `onBefore` or `onEnter`. + * Plugins can define custom hook types, such as sticky states does for `onInactive`. + * + * @interalapi + */ +var TransitionEventType = /** @class */ (function () { + function TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) { + if (reverseSort === void 0) { reverseSort = false; } + if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; } + if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; } + if (synchronous === void 0) { synchronous = false; } + this.name = name; + this.hookPhase = hookPhase; + this.hookOrder = hookOrder; + this.criteriaMatchPath = criteriaMatchPath; + this.reverseSort = reverseSort; + this.getResultHandler = getResultHandler; + this.getErrorHandler = getErrorHandler; + this.synchronous = synchronous; + } + return TransitionEventType; +}()); + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that skips a transition if it should be ignored + * + * This hook is invoked at the end of the onBefore phase. + * + * If the transition should be ignored (because no parameter or states changed) + * then the transition is ignored and not processed. + */ +function ignoredHook(trans) { + var ignoredReason = trans._ignoredReason(); + if (!ignoredReason) + return; + trace.traceTransitionIgnored(trans); + var pending = trans.router.globals.transition; + // The user clicked a link going back to the *current state* ('A') + // However, there is also a pending transition in flight (to 'B') + // Abort the transition to 'B' because the user now wants to be back at 'A'. + if (ignoredReason === 'SameAsCurrent' && pending) { + pending.abort(); + } + return Rejection.ignored().toPromise(); +} +var registerIgnoredTransitionHook = function (transitionService) { + return transitionService.onBefore({}, ignoredHook, { priority: -9999 }); +}; + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that rejects the Transition if it is invalid + * + * This hook is invoked at the end of the onBefore phase. + * If the transition is invalid (for example, param values do not validate) + * then the transition is rejected. + */ +function invalidTransitionHook(trans) { + if (!trans.valid()) { + throw new Error(trans.error()); + } +} +var registerInvalidTransitionHook = function (transitionService) { + return transitionService.onBefore({}, invalidTransitionHook, { priority: -10000 }); +}; + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +/** + * The default [[Transition]] options. + * + * Include this object when applying custom defaults: + * let reloadOpts = { reload: true, notify: true } + * let options = defaults(theirOpts, customDefaults, defaultOptions); + */ +var defaultTransOpts = { + location: true, + relative: null, + inherit: false, + notify: true, + reload: false, + custom: {}, + current: function () { return null; }, + source: "unknown" +}; +/** + * This class provides services related to Transitions. + * + * - Most importantly, it allows global Transition Hooks to be registered. + * - It allows the default transition error handler to be set. + * - It also has a factory function for creating new [[Transition]] objects, (used internally by the [[StateService]]). + * + * At bootstrap, [[UIRouter]] creates a single instance (singleton) of this class. + */ +var TransitionService = /** @class */ (function () { + /** @hidden */ + function TransitionService(_router) { + /** @hidden */ + this._transitionCount = 0; + /** @hidden The transition hook types, such as `onEnter`, `onStart`, etc */ + this._eventTypes = []; + /** @hidden The registered transition hooks */ + this._registeredHooks = {}; + /** @hidden The paths on a criteria object */ + this._criteriaPaths = {}; + this._router = _router; + this.$view = _router.viewService; + this._deregisterHookFns = {}; + this._pluginapi = createProxyFunctions(val(this), {}, val(this), [ + '_definePathType', + '_defineEvent', + '_getPathTypes', + '_getEvents', + 'getHooks', + ]); + this._defineCorePaths(); + this._defineCoreEvents(); + this._registerCoreTransitionHooks(); + } + /** + * Registers a [[TransitionHookFn]], called *while a transition is being constructed*. + * + * Registers a transition lifecycle hook, which is invoked during transition construction. + * + * This low level hook should only be used by plugins. + * This can be a useful time for plugins to add resolves or mutate the transition as needed. + * The Sticky States plugin uses this hook to modify the treechanges. + * + * ### Lifecycle + * + * `onCreate` hooks are invoked *while a transition is being constructed*. + * + * ### Return value + * + * The hook's return value is ignored + * + * @internalapi + * @param criteria defines which Transitions the Hook should be invoked for. + * @param callback the hook function which will be invoked. + * @param options the registration options + * @returns a function which deregisters the hook. + */ + TransitionService.prototype.onCreate = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onBefore = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onStart = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onExit = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onRetain = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onEnter = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onFinish = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onSuccess = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onError = function (criteria, callback, options) { return; }; + /** + * dispose + * @internalapi + */ + TransitionService.prototype.dispose = function (router) { + values(this._registeredHooks).forEach(function (hooksArray) { return hooksArray.forEach(function (hook) { + hook._deregistered = true; + removeFrom(hooksArray, hook); + }); }); + }; + /** + * Creates a new [[Transition]] object + * + * This is a factory function for creating new Transition objects. + * It is used internally by the [[StateService]] and should generally not be called by application code. + * + * @param fromPath the path to the current state (the from state) + * @param targetState the target state (destination) + * @returns a Transition + */ + TransitionService.prototype.create = function (fromPath, targetState) { + return new Transition(fromPath, targetState, this._router); + }; + /** @hidden */ + TransitionService.prototype._defineCoreEvents = function () { + var Phase = exports.TransitionHookPhase; + var TH = TransitionHook; + var paths = this._criteriaPaths; + var NORMAL_SORT = false, REVERSE_SORT = true; + var ASYNCHRONOUS = false, SYNCHRONOUS = true; + this._defineEvent("onCreate", Phase.CREATE, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.THROW_ERROR, SYNCHRONOUS); + this._defineEvent("onBefore", Phase.BEFORE, 0, paths.to); + this._defineEvent("onStart", Phase.RUN, 0, paths.to); + this._defineEvent("onExit", Phase.RUN, 100, paths.exiting, REVERSE_SORT); + this._defineEvent("onRetain", Phase.RUN, 200, paths.retained); + this._defineEvent("onEnter", Phase.RUN, 300, paths.entering); + this._defineEvent("onFinish", Phase.RUN, 400, paths.to); + this._defineEvent("onSuccess", Phase.SUCCESS, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS); + this._defineEvent("onError", Phase.ERROR, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS); + }; + /** @hidden */ + TransitionService.prototype._defineCorePaths = function () { + var STATE = exports.TransitionHookScope.STATE, TRANSITION = exports.TransitionHookScope.TRANSITION; + this._definePathType("to", TRANSITION); + this._definePathType("from", TRANSITION); + this._definePathType("exiting", STATE); + this._definePathType("retained", STATE); + this._definePathType("entering", STATE); + }; + /** @hidden */ + TransitionService.prototype._defineEvent = function (name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) { + if (reverseSort === void 0) { reverseSort = false; } + if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; } + if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; } + if (synchronous === void 0) { synchronous = false; } + var eventType = new TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous); + this._eventTypes.push(eventType); + makeEvent(this, this, eventType); + }; + + /** @hidden */ + TransitionService.prototype._getEvents = function (phase) { + var transitionHookTypes = isDefined(phase) ? + this._eventTypes.filter(function (type) { return type.hookPhase === phase; }) : + this._eventTypes.slice(); + return transitionHookTypes.sort(function (l, r) { + var cmpByPhase = l.hookPhase - r.hookPhase; + return cmpByPhase === 0 ? l.hookOrder - r.hookOrder : cmpByPhase; + }); + }; + /** + * Adds a Path to be used as a criterion against a TreeChanges path + * + * For example: the `exiting` path in [[HookMatchCriteria]] is a STATE scoped path. + * It was defined by calling `defineTreeChangesCriterion('exiting', TransitionHookScope.STATE)` + * Each state in the exiting path is checked against the criteria and returned as part of the match. + * + * Another example: the `to` path in [[HookMatchCriteria]] is a TRANSITION scoped path. + * It was defined by calling `defineTreeChangesCriterion('to', TransitionHookScope.TRANSITION)` + * Only the tail of the `to` path is checked against the criteria and returned as part of the match. + * + * @hidden + */ + TransitionService.prototype._definePathType = function (name, hookScope) { + this._criteriaPaths[name] = { name: name, scope: hookScope }; + }; + /** * @hidden */ + TransitionService.prototype._getPathTypes = function () { + return this._criteriaPaths; + }; + /** @hidden */ + TransitionService.prototype.getHooks = function (hookName) { + return this._registeredHooks[hookName]; + }; + /** @hidden */ + TransitionService.prototype._registerCoreTransitionHooks = function () { + var fns = this._deregisterHookFns; + fns.addCoreResolves = registerAddCoreResolvables(this); + fns.ignored = registerIgnoredTransitionHook(this); + fns.invalid = registerInvalidTransitionHook(this); + // Wire up redirectTo hook + fns.redirectTo = registerRedirectToHook(this); + // Wire up onExit/Retain/Enter state hooks + fns.onExit = registerOnExitHook(this); + fns.onRetain = registerOnRetainHook(this); + fns.onEnter = registerOnEnterHook(this); + // Wire up Resolve hooks + fns.eagerResolve = registerEagerResolvePath(this); + fns.lazyResolve = registerLazyResolveState(this); + // Wire up the View management hooks + fns.loadViews = registerLoadEnteringViews(this); + fns.activateViews = registerActivateViews(this); + // Updates global state after a transition + fns.updateGlobals = registerUpdateGlobalState(this); + // After globals.current is updated at priority: 10000 + fns.updateUrl = registerUpdateUrl(this); + // Lazy load state trees + fns.lazyLoad = registerLazyLoadHook(this); + }; + return TransitionService; +}()); + +/** + * @coreapi + * @module state + */ +/** */ +/** + * Provides state related service functions + * + * This class provides services related to ui-router states. + * An instance of this class is located on the global [[UIRouter]] object. + */ +var StateService = /** @class */ (function () { + /** @internalapi */ + function StateService(router) { + this.router = router; + /** @internalapi */ + this.invalidCallbacks = []; + /** @hidden */ + this._defaultErrorHandler = function $defaultErrorHandler($error$) { + if ($error$ instanceof Error && $error$.stack) { + console.error($error$); + console.error($error$.stack); + } + else if ($error$ instanceof Rejection) { + console.error($error$.toString()); + if ($error$.detail && $error$.detail.stack) + console.error($error$.detail.stack); + } + else { + console.error($error$); + } + }; + var getters = ['current', '$current', 'params', 'transition']; + var boundFns = Object.keys(StateService.prototype).filter(not(inArray(getters))); + createProxyFunctions(val(StateService.prototype), this, val(this), boundFns); + } + Object.defineProperty(StateService.prototype, "transition", { + /** + * The [[Transition]] currently in progress (or null) + * + * This is a passthrough through to [[UIRouterGlobals.transition]] + */ + get: function () { return this.router.globals.transition; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "params", { + /** + * The latest successful state parameters + * + * This is a passthrough through to [[UIRouterGlobals.params]] + */ + get: function () { return this.router.globals.params; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "current", { + /** + * The current [[StateDeclaration]] + * + * This is a passthrough through to [[UIRouterGlobals.current]] + */ + get: function () { return this.router.globals.current; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "$current", { + /** + * The current [[StateObject]] + * + * This is a passthrough through to [[UIRouterGlobals.$current]] + */ + get: function () { return this.router.globals.$current; }, + enumerable: true, + configurable: true + }); + /** @internalapi */ + StateService.prototype.dispose = function () { + this.defaultErrorHandler(noop$1); + this.invalidCallbacks = []; + }; + /** + * Handler for when [[transitionTo]] is called with an invalid state. + * + * Invokes the [[onInvalid]] callbacks, in natural order. + * Each callback's return value is checked in sequence until one of them returns an instance of TargetState. + * The results of the callbacks are wrapped in $q.when(), so the callbacks may return promises. + * + * If a callback returns an TargetState, then it is used as arguments to $state.transitionTo() and the result returned. + * + * @internalapi + */ + StateService.prototype._handleInvalidTargetState = function (fromPath, toState) { + var _this = this; + var fromState = PathUtils.makeTargetState(this.router.stateRegistry, fromPath); + var globals = this.router.globals; + var latestThing = function () { return globals.transitionHistory.peekTail(); }; + var latest = latestThing(); + var callbackQueue = new Queue(this.invalidCallbacks.slice()); + var injector = new ResolveContext(fromPath).injector(); + var checkForRedirect = function (result) { + if (!(result instanceof TargetState)) { + return; + } + var target = result; + // Recreate the TargetState, in case the state is now defined. + target = _this.target(target.identifier(), target.params(), target.options()); + if (!target.valid()) { + return Rejection.invalid(target.error()).toPromise(); + } + if (latestThing() !== latest) { + return Rejection.superseded().toPromise(); + } + return _this.transitionTo(target.identifier(), target.params(), target.options()); + }; + function invokeNextCallback() { + var nextCallback = callbackQueue.dequeue(); + if (nextCallback === undefined) + return Rejection.invalid(toState.error()).toPromise(); + var callbackResult = services.$q.when(nextCallback(toState, fromState, injector)); + return callbackResult.then(checkForRedirect).then(function (result) { return result || invokeNextCallback(); }); + } + return invokeNextCallback(); + }; + /** + * Registers an Invalid State handler + * + * Registers a [[OnInvalidCallback]] function to be invoked when [[StateService.transitionTo]] + * has been called with an invalid state reference parameter + * + * Example: + * ```js + * stateService.onInvalid(function(to, from, injector) { + * if (to.name() === 'foo') { + * let lazyLoader = injector.get('LazyLoadService'); + * return lazyLoader.load('foo') + * .then(() => stateService.target('foo')); + * } + * }); + * ``` + * + * @param {function} callback invoked when the toState is invalid + * This function receives the (invalid) toState, the fromState, and an injector. + * The function may optionally return a [[TargetState]] or a Promise for a TargetState. + * If one is returned, it is treated as a redirect. + * + * @returns a function which deregisters the callback + */ + StateService.prototype.onInvalid = function (callback) { + this.invalidCallbacks.push(callback); + return function deregisterListener() { + removeFrom(this.invalidCallbacks)(callback); + }.bind(this); + }; + /** + * Reloads the current state + * + * A method that force reloads the current state, or a partial state hierarchy. + * All resolves are re-resolved, and components reinstantiated. + * + * #### Example: + * ```js + * let app angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.reload = function(){ + * $state.reload(); + * } + * }); + * ``` + * + * Note: `reload()` is just an alias for: + * + * ```js + * $state.transitionTo($state.current, $state.params, { + * reload: true, inherit: false + * }); + * ``` + * + * @param reloadState A state name or a state object. + * If present, this state and all its children will be reloaded, but ancestors will not reload. + * + * #### Example: + * ```js + * //assuming app application consists of 3 states: 'contacts', 'contacts.detail', 'contacts.detail.item' + * //and current state is 'contacts.detail.item' + * let app angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.reload = function(){ + * //will reload 'contact.detail' and nested 'contact.detail.item' states + * $state.reload('contact.detail'); + * } + * }); + * ``` + * + * @returns A promise representing the state of the new transition. See [[StateService.go]] + */ + StateService.prototype.reload = function (reloadState) { + return this.transitionTo(this.current, this.params, { + reload: isDefined(reloadState) ? reloadState : true, + inherit: false, + notify: false, + }); + }; + + /** + * Transition to a different state and/or parameters + * + * Convenience method for transitioning to a new state. + * + * `$state.go` calls `$state.transitionTo` internally but automatically sets options to + * `{ location: true, inherit: true, relative: router.globals.$current, notify: true }`. + * This allows you to use either an absolute or relative `to` argument (because of `relative: router.globals.$current`). + * It also allows you to specify * only the parameters you'd like to update, while letting unspecified parameters + * inherit from the current parameter values (because of `inherit: true`). + * + * #### Example: + * ```js + * let app = angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.changeState = function () { + * $state.go('contact.detail'); + * }; + * }); + * ``` + * + * @param to Absolute state name, state object, or relative state path (relative to current state). + * + * Some examples: + * + * - `$state.go('contact.detail')` - will go to the `contact.detail` state + * - `$state.go('^')` - will go to the parent state + * - `$state.go('^.sibling')` - if current state is `home.child`, will go to the `home.sibling` state + * - `$state.go('.child.grandchild')` - if current state is home, will go to the `home.child.grandchild` state + * + * @param params A map of the parameters that will be sent to the state, will populate $stateParams. + * + * Any parameters that are not specified will be inherited from current parameter values (because of `inherit: true`). + * This allows, for example, going to a sibling state that shares parameters defined by a parent state. + * + * @param options Transition options + * + * @returns {promise} A promise representing the state of the new transition. + */ + StateService.prototype.go = function (to, params, options) { + var defautGoOpts = { relative: this.$current, inherit: true }; + var transOpts = defaults(options, defautGoOpts, defaultTransOpts); + return this.transitionTo(to, params, transOpts); + }; + + /** + * Creates a [[TargetState]] + * + * This is a factory method for creating a TargetState + * + * This may be returned from a Transition Hook to redirect a transition, for example. + */ + StateService.prototype.target = function (identifier, params, options) { + if (options === void 0) { options = {}; } + // If we're reloading, find the state object to reload from + if (isObject(options.reload) && !options.reload.name) + throw new Error('Invalid reload state object'); + var reg = this.router.stateRegistry; + options.reloadState = options.reload === true ? reg.root() : reg.matcher.find(options.reload, options.relative); + if (options.reload && !options.reloadState) + throw new Error("No such reload state '" + (isString(options.reload) ? options.reload : options.reload.name) + "'"); + return new TargetState(this.router.stateRegistry, identifier, params, options); + }; + + StateService.prototype.getCurrentPath = function () { + var _this = this; + var globals = this.router.globals; + var latestSuccess = globals.successfulTransitions.peekTail(); + var rootPath = function () { return [new PathNode(_this.router.stateRegistry.root())]; }; + return latestSuccess ? latestSuccess.treeChanges().to : rootPath(); + }; + /** + * Low-level method for transitioning to a new state. + * + * The [[go]] method (which uses `transitionTo` internally) is recommended in most situations. + * + * #### Example: + * ```js + * let app = angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.changeState = function () { + * $state.transitionTo('contact.detail'); + * }; + * }); + * ``` + * + * @param to State name or state object. + * @param toParams A map of the parameters that will be sent to the state, + * will populate $stateParams. + * @param options Transition options + * + * @returns A promise representing the state of the new transition. See [[go]] + */ + StateService.prototype.transitionTo = function (to, toParams, options) { + var _this = this; + if (toParams === void 0) { toParams = {}; } + if (options === void 0) { options = {}; } + var router = this.router; + var globals = router.globals; + options = defaults(options, defaultTransOpts); + var getCurrent = function () { + return globals.transition; + }; + options = extend(options, { current: getCurrent }); + var ref = this.target(to, toParams, options); + var currentPath = this.getCurrentPath(); + if (!ref.exists()) + return this._handleInvalidTargetState(currentPath, ref); + if (!ref.valid()) + return silentRejection(ref.error()); + /** + * Special handling for Ignored, Aborted, and Redirected transitions + * + * The semantics for the transition.run() promise and the StateService.transitionTo() + * promise differ. For instance, the run() promise may be rejected because it was + * IGNORED, but the transitionTo() promise is resolved because from the user perspective + * no error occurred. Likewise, the transition.run() promise may be rejected because of + * a Redirect, but the transitionTo() promise is chained to the new Transition's promise. + */ + var rejectedTransitionHandler = function (transition) { return function (error) { + if (error instanceof Rejection) { + var isLatest = router.globals.lastStartedTransitionId === transition.$id; + if (error.type === exports.RejectType.IGNORED) { + isLatest && router.urlRouter.update(); + // Consider ignored `Transition.run()` as a successful `transitionTo` + return services.$q.when(globals.current); + } + var detail = error.detail; + if (error.type === exports.RejectType.SUPERSEDED && error.redirected && detail instanceof TargetState) { + // If `Transition.run()` was redirected, allow the `transitionTo()` promise to resolve successfully + // by returning the promise for the new (redirect) `Transition.run()`. + var redirect = transition.redirect(detail); + return redirect.run().catch(rejectedTransitionHandler(redirect)); + } + if (error.type === exports.RejectType.ABORTED) { + isLatest && router.urlRouter.update(); + return services.$q.reject(error); + } + } + var errorHandler = _this.defaultErrorHandler(); + errorHandler(error); + return services.$q.reject(error); + }; }; + var transition = this.router.transitionService.create(currentPath, ref); + var transitionToPromise = transition.run().catch(rejectedTransitionHandler(transition)); + silenceUncaughtInPromise(transitionToPromise); // issue #2676 + // Return a promise for the transition, which also has the transition object on it. + return extend(transitionToPromise, { transition: transition }); + }; + + /** + * Checks if the current state *is* the provided state + * + * Similar to [[includes]] but only checks for the full state name. + * If params is supplied then it will be tested for strict equality against the current + * active params object, so all params must match with none missing and no extras. + * + * #### Example: + * ```js + * $state.$current.name = 'contacts.details.item'; + * + * // absolute name + * $state.is('contact.details.item'); // returns true + * $state.is(contactDetailItemStateObject); // returns true + * ``` + * + * // relative name (. and ^), typically from a template + * // E.g. from the 'contacts.details' template + * ```html + *
Item
+ * ``` + * + * @param stateOrName The state name (absolute or relative) or state object you'd like to check. + * @param params A param object, e.g. `{sectionId: section.id}`, that you'd like + * to test against the current active state. + * @param options An options object. The options are: + * - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will + * test relative to `options.relative` state (or name). + * + * @returns Returns true if it is the state. + */ + StateService.prototype.is = function (stateOrName, params, options) { + options = defaults(options, { relative: this.$current }); + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative); + if (!isDefined(state)) + return undefined; + if (this.$current !== state) + return false; + if (!params) + return true; + var schema = state.parameters({ inherit: true, matchingKeys: params }); + return Param.equals(schema, Param.values(schema, params), this.params); + }; + + /** + * Checks if the current state *includes* the provided state + * + * A method to determine if the current active state is equal to or is the child of the + * state stateName. If any params are passed then they will be tested for a match as well. + * Not all the parameters need to be passed, just the ones you'd like to test for equality. + * + * #### Example when `$state.$current.name === 'contacts.details.item'` + * ```js + * // Using partial names + * $state.includes("contacts"); // returns true + * $state.includes("contacts.details"); // returns true + * $state.includes("contacts.details.item"); // returns true + * $state.includes("contacts.list"); // returns false + * $state.includes("about"); // returns false + * ``` + * + * #### Glob Examples when `* $state.$current.name === 'contacts.details.item.url'`: + * ```js + * $state.includes("*.details.*.*"); // returns true + * $state.includes("*.details.**"); // returns true + * $state.includes("**.item.**"); // returns true + * $state.includes("*.details.item.url"); // returns true + * $state.includes("*.details.*.url"); // returns true + * $state.includes("*.details.*"); // returns false + * $state.includes("item.**"); // returns false + * ``` + * + * @param stateOrName A partial name, relative name, glob pattern, + * or state object to be searched for within the current state name. + * @param params A param object, e.g. `{sectionId: section.id}`, + * that you'd like to test against the current active state. + * @param options An options object. The options are: + * - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will + * test relative to `options.relative` state (or name). + * + * @returns {boolean} Returns true if it does include the state + */ + StateService.prototype.includes = function (stateOrName, params, options) { + options = defaults(options, { relative: this.$current }); + var glob = isString(stateOrName) && Glob.fromString(stateOrName); + if (glob) { + if (!glob.matches(this.$current.name)) + return false; + stateOrName = this.$current.name; + } + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative), include = this.$current.includes; + if (!isDefined(state)) + return undefined; + if (!isDefined(include[state.name])) + return false; + if (!params) + return true; + var schema = state.parameters({ inherit: true, matchingKeys: params }); + return Param.equals(schema, Param.values(schema, params), this.params); + }; + + /** + * Generates a URL for a state and parameters + * + * Returns the url for the given state populated with the given params. + * + * #### Example: + * ```js + * expect($state.href("about.person", { person: "bob" })).toEqual("/about/bob"); + * ``` + * + * @param stateOrName The state name or state object you'd like to generate a url from. + * @param params An object of parameter values to fill the state's required parameters. + * @param options Options object. The options are: + * + * @returns {string} compiled state url + */ + StateService.prototype.href = function (stateOrName, params, options) { + var defaultHrefOpts = { + lossy: true, + inherit: true, + absolute: false, + relative: this.$current, + }; + options = defaults(options, defaultHrefOpts); + params = params || {}; + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative); + if (!isDefined(state)) + return null; + if (options.inherit) + params = this.params.$inherit(params, this.$current, state); + var nav = (state && options.lossy) ? state.navigable : state; + if (!nav || nav.url === undefined || nav.url === null) { + return null; + } + return this.router.urlRouter.href(nav.url, params, { + absolute: options.absolute, + }); + }; + + /** + * Sets or gets the default [[transitionTo]] error handler. + * + * The error handler is called when a [[Transition]] is rejected or when any error occurred during the Transition. + * This includes errors caused by resolves and transition hooks. + * + * Note: + * This handler does not receive certain Transition rejections. + * Redirected and Ignored Transitions are not considered to be errors by [[StateService.transitionTo]]. + * + * The built-in default error handler logs the error to the console. + * + * You can provide your own custom handler. + * + * #### Example: + * ```js + * stateService.defaultErrorHandler(function() { + * // Do not log transitionTo errors + * }); + * ``` + * + * @param handler a global error handler function + * @returns the current global error handler + */ + StateService.prototype.defaultErrorHandler = function (handler) { + return this._defaultErrorHandler = handler || this._defaultErrorHandler; + }; + StateService.prototype.get = function (stateOrName, base) { + var reg = this.router.stateRegistry; + if (arguments.length === 0) + return reg.get(); + return reg.get(stateOrName, base || this.$current); + }; + /** + * Lazy loads a state + * + * Explicitly runs a state's [[StateDeclaration.lazyLoad]] function. + * + * @param stateOrName the state that should be lazy loaded + * @param transition the optional Transition context to use (if the lazyLoad function requires an injector, etc) + * Note: If no transition is provided, a noop transition is created using the from the current state to the current state. + * This noop transition is not actually run. + * + * @returns a promise to lazy load + */ + StateService.prototype.lazyLoad = function (stateOrName, transition) { + var state = this.get(stateOrName); + if (!state || !state.lazyLoad) + throw new Error("Can not lazy load " + stateOrName); + var currentPath = this.getCurrentPath(); + var target = PathUtils.makeTargetState(this.router.stateRegistry, currentPath); + transition = transition || this.router.transitionService.create(currentPath, target); + return lazyLoadState(transition, state); + }; + return StateService; +}()); + +/** + * # Transition subsystem + * + * This module contains APIs related to a Transition. + * + * See: + * - [[TransitionService]] + * - [[Transition]] + * - [[HookFn]], [[TransitionHookFn]], [[TransitionStateHookFn]], [[HookMatchCriteria]], [[HookResult]] + * + * @coreapi + * @preferred + * @module transition + */ /** for typedoc */ + +/** + * @internalapi + * @module vanilla + */ +/** */ +/** + * An angular1-like promise api + * + * This object implements four methods similar to the + * [angular 1 promise api](https://docs.angularjs.org/api/ng/service/$q) + * + * UI-Router evolved from an angular 1 library to a framework agnostic library. + * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection. + * + * This API provides native ES6 promise support wrapped as a $q-like API. + * Internally, UI-Router uses this $q object to perform promise operations. + * The `angular-ui-router` (ui-router for angular 1) uses the $q API provided by angular. + * + * $q-like promise api + */ +var $q = { + /** Normalizes a value as a promise */ + when: function (val) { return new Promise(function (resolve, reject) { return resolve(val); }); }, + /** Normalizes a value as a promise rejection */ + reject: function (val) { return new Promise(function (resolve, reject) { reject(val); }); }, + /** @returns a deferred object, which has `resolve` and `reject` functions */ + defer: function () { + var deferred = {}; + deferred.promise = new Promise(function (resolve, reject) { + deferred.resolve = resolve; + deferred.reject = reject; + }); + return deferred; + }, + /** Like Promise.all(), but also supports object key/promise notation like $q */ + all: function (promises) { + if (isArray(promises)) { + return Promise.all(promises); + } + if (isObject(promises)) { + // Convert promises map to promises array. + // When each promise resolves, map it to a tuple { key: key, val: val } + var chain = Object.keys(promises) + .map(function (key) { return promises[key].then(function (val) { return ({ key: key, val: val }); }); }); + // Then wait for all promises to resolve, and convert them back to an object + return $q.all(chain).then(function (values) { + return values.reduce(function (acc, tuple) { acc[tuple.key] = tuple.val; return acc; }, {}); + }); + } + } +}; + +/** + * @internalapi + * @module vanilla + */ +/** */ +// globally available injectables +var globals = {}; +var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; +var ARGUMENT_NAMES = /([^\s,]+)/g; +/** + * A basic angular1-like injector api + * + * This object implements four methods similar to the + * [angular 1 dependency injector](https://docs.angularjs.org/api/auto/service/$injector) + * + * UI-Router evolved from an angular 1 library to a framework agnostic library. + * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection. + * + * This object provides a naive implementation of a globally scoped dependency injection system. + * It supports the following DI approaches: + * + * ### Function parameter names + * + * A function's `.toString()` is called, and the parameter names are parsed. + * This only works when the parameter names aren't "mangled" by a minifier such as UglifyJS. + * + * ```js + * function injectedFunction(FooService, BarService) { + * // FooService and BarService are injected + * } + * ``` + * + * ### Function annotation + * + * A function may be annotated with an array of dependency names as the `$inject` property. + * + * ```js + * injectedFunction.$inject = [ 'FooService', 'BarService' ]; + * function injectedFunction(fs, bs) { + * // FooService and BarService are injected as fs and bs parameters + * } + * ``` + * + * ### Array notation + * + * An array provides the names of the dependencies to inject (as strings). + * The function is the last element of the array. + * + * ```js + * [ 'FooService', 'BarService', function (fs, bs) { + * // FooService and BarService are injected as fs and bs parameters + * }] + * ``` + * + * @type {$InjectorLike} + */ +var $injector = { + /** Gets an object from DI based on a string token */ + get: function (name) { return globals[name]; }, + /** Returns true if an object named `name` exists in global DI */ + has: function (name) { return $injector.get(name) != null; }, + /** + * Injects a function + * + * @param fn the function to inject + * @param context the function's `this` binding + * @param locals An object with additional DI tokens and values, such as `{ someToken: { foo: 1 } }` + */ + invoke: function (fn, context, locals) { + var all = extend({}, globals, locals || {}); + var params = $injector.annotate(fn); + var ensureExist = assertPredicate(function (key) { return all.hasOwnProperty(key); }, function (key) { return "DI can't find injectable: '" + key + "'"; }); + var args = params.filter(ensureExist).map(function (x) { return all[x]; }); + if (isFunction(fn)) + return fn.apply(context, args); + else + return fn.slice(-1)[0].apply(context, args); + }, + /** + * Returns a function's dependencies + * + * Analyzes a function (or array) and returns an array of DI tokens that the function requires. + * @return an array of `string`s + */ + annotate: function (fn) { + if (!isInjectable(fn)) + throw new Error("Not an injectable function: " + fn); + if (fn && fn.$inject) + return fn.$inject; + if (isArray(fn)) + return fn.slice(0, -1); + var fnStr = fn.toString().replace(STRIP_COMMENTS, ''); + var result = fnStr.slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')')).match(ARGUMENT_NAMES); + return result || []; + } +}; + +/** + * @internalapi + * @module vanilla + */ +/** */ +var keyValsToObjectR = function (accum, _a) { + var key = _a[0], val = _a[1]; + if (!accum.hasOwnProperty(key)) { + accum[key] = val; + } + else if (isArray(accum[key])) { + accum[key].push(val); + } + else { + accum[key] = [accum[key], val]; + } + return accum; +}; +var getParams = function (queryString) { + return queryString.split("&").filter(identity).map(splitEqual).reduce(keyValsToObjectR, {}); +}; +function parseUrl$1(url) { + var orEmptyString = function (x) { return x || ""; }; + var _a = splitHash(url).map(orEmptyString), beforehash = _a[0], hash = _a[1]; + var _b = splitQuery(beforehash).map(orEmptyString), path = _b[0], search = _b[1]; + return { path: path, search: search, hash: hash, url: url }; +} +var buildUrl = function (loc) { + var path = loc.path(); + var searchObject = loc.search(); + var hash = loc.hash(); + var search = Object.keys(searchObject).map(function (key) { + var param = searchObject[key]; + var vals = isArray(param) ? param : [param]; + return vals.map(function (val) { return key + "=" + val; }); + }).reduce(unnestR, []).join("&"); + return path + (search ? "?" + search : "") + (hash ? "#" + hash : ""); +}; +function locationPluginFactory(name, isHtml5, serviceClass, configurationClass) { + return function (router) { + var service = router.locationService = new serviceClass(router); + var configuration = router.locationConfig = new configurationClass(router, isHtml5); + function dispose(router) { + router.dispose(service); + router.dispose(configuration); + } + return { name: name, service: service, configuration: configuration, dispose: dispose }; + }; +} + +/** + * @internalapi + * @module vanilla + */ /** */ +/** A base `LocationServices` */ +var BaseLocationServices = /** @class */ (function () { + function BaseLocationServices(router, fireAfterUpdate) { + var _this = this; + this.fireAfterUpdate = fireAfterUpdate; + this._listener = function (evt) { return _this._listeners.forEach(function (cb) { return cb(evt); }); }; + this._listeners = []; + this.hash = function () { return parseUrl$1(_this._get()).hash; }; + this.path = function () { return parseUrl$1(_this._get()).path; }; + this.search = function () { return getParams(parseUrl$1(_this._get()).search); }; + this._location = root.location; + this._history = root.history; + } + BaseLocationServices.prototype.url = function (url, replace) { + if (replace === void 0) { replace = true; } + if (isDefined(url) && url !== this._get()) { + this._set(null, null, url, replace); + if (this.fireAfterUpdate) { + this._listeners.forEach(function (cb) { return cb({ url: url }); }); + } + } + return buildUrl(this); + }; + BaseLocationServices.prototype.onChange = function (cb) { + var _this = this; + this._listeners.push(cb); + return function () { return removeFrom(_this._listeners, cb); }; + }; + BaseLocationServices.prototype.dispose = function (router) { + deregAll(this._listeners); + }; + return BaseLocationServices; +}()); + +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationServices` that uses the browser hash "#" to get/set the current location */ +var HashLocationService = /** @class */ (function (_super) { + __extends(HashLocationService, _super); + function HashLocationService(router) { + var _this = _super.call(this, router, false) || this; + root.addEventListener('hashchange', _this._listener, false); + return _this; + } + HashLocationService.prototype._get = function () { + return trimHashVal(this._location.hash); + }; + HashLocationService.prototype._set = function (state, title, url, replace) { + this._location.hash = url; + }; + HashLocationService.prototype.dispose = function (router) { + _super.prototype.dispose.call(this, router); + root.removeEventListener('hashchange', this._listener); + }; + return HashLocationService; +}(BaseLocationServices)); + +var __extends$1 = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationServices` that gets/sets the current location from an in-memory object */ +var MemoryLocationService = /** @class */ (function (_super) { + __extends$1(MemoryLocationService, _super); + function MemoryLocationService(router) { + return _super.call(this, router, true) || this; + } + MemoryLocationService.prototype._get = function () { + return this._url; + }; + MemoryLocationService.prototype._set = function (state, title, url, replace) { + this._url = url; + }; + return MemoryLocationService; +}(BaseLocationServices)); + +var __extends$2 = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * A `LocationServices` that gets/sets the current location using the browser's `location` and `history` apis + * + * Uses `history.pushState` and `history.replaceState` + */ +var PushStateLocationService = /** @class */ (function (_super) { + __extends$2(PushStateLocationService, _super); + function PushStateLocationService(router) { + var _this = _super.call(this, router, true) || this; + _this._config = router.urlService.config; + root.addEventListener('popstate', _this._listener, false); + return _this; + } + + /** + * Gets the base prefix without: + * - trailing slash + * - trailing filename + * - protocol and hostname + * + * If , this returns '/base'. + * If , this returns '/base'. + * + * See: https://html.spec.whatwg.org/dev/semantics.html#the-base-element + */ + PushStateLocationService.prototype._getBasePrefix = function () { + return stripFile(this._config.baseHref()); + }; + PushStateLocationService.prototype._get = function () { + var _a = this._location, pathname = _a.pathname, hash = _a.hash, search = _a.search; + search = splitQuery(search)[1]; // strip ? if found + hash = splitHash(hash)[1]; // strip # if found + var basePrefix = this._getBasePrefix(); + var exactMatch = pathname === this._config.baseHref(); + var startsWith = pathname.startsWith(basePrefix); + pathname = exactMatch ? '/' : startsWith ? pathname.substring(basePrefix.length) : pathname; + return pathname + (search ? '?' + search : '') + (hash ? '#' + hash : ''); + }; + PushStateLocationService.prototype._set = function (state, title, url, replace) { + var fullUrl = this._getBasePrefix() + url; + if (replace) { + this._history.replaceState(state, title, fullUrl); + } + else { + this._history.pushState(state, title, fullUrl); + } + }; + PushStateLocationService.prototype.dispose = function (router) { + _super.prototype.dispose.call(this, router); + root.removeEventListener('popstate', this._listener); + }; + return PushStateLocationService; +}(BaseLocationServices)); + +/** A `LocationConfig` mock that gets/sets all config from an in-memory object */ +var MemoryLocationConfig = /** @class */ (function () { + function MemoryLocationConfig() { + var _this = this; + this._baseHref = ''; + this._port = 80; + this._protocol = "http"; + this._host = "localhost"; + this._hashPrefix = ""; + this.port = function () { return _this._port; }; + this.protocol = function () { return _this._protocol; }; + this.host = function () { return _this._host; }; + this.baseHref = function () { return _this._baseHref; }; + this.html5Mode = function () { return false; }; + this.hashPrefix = function (newval) { return isDefined(newval) ? _this._hashPrefix = newval : _this._hashPrefix; }; + this.dispose = noop$1; + } + return MemoryLocationConfig; +}()); + +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationConfig` that delegates to the browser's `location` object */ +var BrowserLocationConfig = /** @class */ (function () { + function BrowserLocationConfig(router, _isHtml5) { + if (_isHtml5 === void 0) { _isHtml5 = false; } + this._isHtml5 = _isHtml5; + this._baseHref = undefined; + this._hashPrefix = ""; + } + BrowserLocationConfig.prototype.port = function () { + if (location.port) { + return Number(location.port); + } + return this.protocol() === 'https' ? 443 : 80; + }; + BrowserLocationConfig.prototype.protocol = function () { + return location.protocol.replace(/:/g, ''); + }; + BrowserLocationConfig.prototype.host = function () { + return location.hostname; + }; + BrowserLocationConfig.prototype.html5Mode = function () { + return this._isHtml5; + }; + BrowserLocationConfig.prototype.hashPrefix = function (newprefix) { + return isDefined(newprefix) ? this._hashPrefix = newprefix : this._hashPrefix; + }; + + BrowserLocationConfig.prototype.baseHref = function (href) { + return isDefined(href) ? this._baseHref = href : + isDefined(this._baseHref) ? this._baseHref : this.applyDocumentBaseHref(); + }; + BrowserLocationConfig.prototype.applyDocumentBaseHref = function () { + var baseTag = document.getElementsByTagName("base")[0]; + return this._baseHref = baseTag ? baseTag.href.substr(location.origin.length) : ""; + }; + BrowserLocationConfig.prototype.dispose = function () { }; + return BrowserLocationConfig; +}()); + +/** + * @internalapi + * @module vanilla + */ +/** */ +function servicesPlugin(router) { + services.$injector = $injector; + services.$q = $q; + return { name: "vanilla.services", $q: $q, $injector: $injector, dispose: function () { return null; } }; +} +/** A `UIRouterPlugin` uses the browser hash to get/set the current location */ +var hashLocationPlugin = locationPluginFactory('vanilla.hashBangLocation', false, HashLocationService, BrowserLocationConfig); +/** A `UIRouterPlugin` that gets/sets the current location using the browser's `location` and `history` apis */ +var pushStateLocationPlugin = locationPluginFactory("vanilla.pushStateLocation", true, PushStateLocationService, BrowserLocationConfig); +/** A `UIRouterPlugin` that gets/sets the current location from an in-memory object */ +var memoryLocationPlugin = locationPluginFactory("vanilla.memoryLocation", false, MemoryLocationService, MemoryLocationConfig); + +/** + * @internalapi + * @module vanilla + */ +/** */ + +/** + * # Core classes and interfaces + * + * The classes and interfaces that are core to ui-router and do not belong + * to a more specific subsystem (such as resolve). + * + * @coreapi + * @preferred + * @module core + */ /** for typedoc */ +/** @internalapi */ +var UIRouterPluginBase = /** @class */ (function () { + function UIRouterPluginBase() { + } + UIRouterPluginBase.prototype.dispose = function (router) { }; + return UIRouterPluginBase; +}()); + +/** + * @coreapi + * @module common + */ /** */ + + + +var index$1 = Object.freeze({ + root: root, + fromJson: fromJson, + toJson: toJson, + forEach: forEach, + extend: extend, + equals: equals, + identity: identity, + noop: noop$1, + createProxyFunctions: createProxyFunctions, + inherit: inherit, + inArray: inArray, + _inArray: _inArray, + removeFrom: removeFrom, + _removeFrom: _removeFrom, + pushTo: pushTo, + _pushTo: _pushTo, + deregAll: deregAll, + defaults: defaults, + mergeR: mergeR, + ancestors: ancestors, + pick: pick, + omit: omit, + pluck: pluck, + filter: filter, + find: find, + mapObj: mapObj, + map: map, + values: values, + allTrueR: allTrueR, + anyTrueR: anyTrueR, + unnestR: unnestR, + flattenR: flattenR, + pushR: pushR, + uniqR: uniqR, + unnest: unnest, + flatten: flatten, + assertPredicate: assertPredicate, + assertMap: assertMap, + assertFn: assertFn, + pairs: pairs, + arrayTuples: arrayTuples, + applyPairs: applyPairs, + tail: tail, + copy: copy, + _extend: _extend, + silenceUncaughtInPromise: silenceUncaughtInPromise, + silentRejection: silentRejection, + notImplemented: notImplemented, + services: services, + Glob: Glob, + curry: curry, + compose: compose, + pipe: pipe, + prop: prop, + propEq: propEq, + parse: parse, + not: not, + and: and, + or: or, + all: all, + any: any, + is: is, + eq: eq, + val: val, + invoke: invoke, + pattern: pattern, + isUndefined: isUndefined, + isDefined: isDefined, + isNull: isNull, + isNullOrUndefined: isNullOrUndefined, + isFunction: isFunction, + isNumber: isNumber, + isString: isString, + isObject: isObject, + isArray: isArray, + isDate: isDate, + isRegExp: isRegExp, + isState: isState, + isInjectable: isInjectable, + isPromise: isPromise, + Queue: Queue, + maxLength: maxLength, + padString: padString, + kebobString: kebobString, + functionToString: functionToString, + fnToString: fnToString, + stringify: stringify, + beforeAfterSubstr: beforeAfterSubstr, + hostRegex: hostRegex, + stripFile: stripFile, + splitHash: splitHash, + splitQuery: splitQuery, + splitEqual: splitEqual, + trimHashVal: trimHashVal, + splitOnDelim: splitOnDelim, + joinNeighborsR: joinNeighborsR, + get Category () { return exports.Category; }, + Trace: Trace, + trace: trace, + get DefType () { return exports.DefType; }, + Param: Param, + ParamTypes: ParamTypes, + StateParams: StateParams, + ParamType: ParamType, + PathNode: PathNode, + PathUtils: PathUtils, + resolvePolicies: resolvePolicies, + defaultResolvePolicy: defaultResolvePolicy, + Resolvable: Resolvable, + NATIVE_INJECTOR_TOKEN: NATIVE_INJECTOR_TOKEN, + ResolveContext: ResolveContext, + resolvablesBuilder: resolvablesBuilder, + StateBuilder: StateBuilder, + StateObject: StateObject, + StateMatcher: StateMatcher, + StateQueueManager: StateQueueManager, + StateRegistry: StateRegistry, + StateService: StateService, + TargetState: TargetState, + get TransitionHookPhase () { return exports.TransitionHookPhase; }, + get TransitionHookScope () { return exports.TransitionHookScope; }, + HookBuilder: HookBuilder, + matchState: matchState, + RegisteredHook: RegisteredHook, + makeEvent: makeEvent, + get RejectType () { return exports.RejectType; }, + Rejection: Rejection, + Transition: Transition, + TransitionHook: TransitionHook, + TransitionEventType: TransitionEventType, + defaultTransOpts: defaultTransOpts, + TransitionService: TransitionService, + UrlMatcher: UrlMatcher, + UrlMatcherFactory: UrlMatcherFactory, + UrlRouter: UrlRouter, + UrlRuleFactory: UrlRuleFactory, + BaseUrlRule: BaseUrlRule, + UrlService: UrlService, + ViewService: ViewService, + UIRouterGlobals: UIRouterGlobals, + UIRouter: UIRouter, + $q: $q, + $injector: $injector, + BaseLocationServices: BaseLocationServices, + HashLocationService: HashLocationService, + MemoryLocationService: MemoryLocationService, + PushStateLocationService: PushStateLocationService, + MemoryLocationConfig: MemoryLocationConfig, + BrowserLocationConfig: BrowserLocationConfig, + keyValsToObjectR: keyValsToObjectR, + getParams: getParams, + parseUrl: parseUrl$1, + buildUrl: buildUrl, + locationPluginFactory: locationPluginFactory, + servicesPlugin: servicesPlugin, + hashLocationPlugin: hashLocationPlugin, + pushStateLocationPlugin: pushStateLocationPlugin, + memoryLocationPlugin: memoryLocationPlugin, + UIRouterPluginBase: UIRouterPluginBase +}); + +function getNg1ViewConfigFactory() { + var templateFactory = null; + return function (path, view) { + templateFactory = templateFactory || services.$injector.get("$templateFactory"); + return [new Ng1ViewConfig(path, view, templateFactory)]; + }; +} +var hasAnyKey = function (keys, obj) { + return keys.reduce(function (acc, key) { return acc || isDefined(obj[key]); }, false); +}; +/** + * This is a [[StateBuilder.builder]] function for angular1 `views`. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * handles the `views` property with logic specific to @uirouter/angularjs (ng1). + * + * If no `views: {}` property exists on the [[StateDeclaration]], then it creates the `views` object + * and applies the state-level configuration to a view named `$default`. + */ +function ng1ViewsBuilder(state) { + // Do not process root state + if (!state.parent) + return {}; + var tplKeys = ['templateProvider', 'templateUrl', 'template', 'notify', 'async'], ctrlKeys = ['controller', 'controllerProvider', 'controllerAs', 'resolveAs'], compKeys = ['component', 'bindings', 'componentProvider'], nonCompKeys = tplKeys.concat(ctrlKeys), allViewKeys = compKeys.concat(nonCompKeys); + // Do not allow a state to have both state-level props and also a `views: {}` property. + // A state without a `views: {}` property can declare properties for the `$default` view as properties of the state. + // However, the `$default` approach should not be mixed with a separate `views: ` block. + if (isDefined(state.views) && hasAnyKey(allViewKeys, state)) { + throw new Error("State '" + state.name + "' has a 'views' object. " + + "It cannot also have \"view properties\" at the state level. " + + "Move the following properties into a view (in the 'views' object): " + + (" " + allViewKeys.filter(function (key) { return isDefined(state[key]); }).join(", "))); + } + var views = {}, viewsObject = state.views || { "$default": pick(state, allViewKeys) }; + forEach(viewsObject, function (config, name) { + // Account for views: { "": { template... } } + name = name || "$default"; + // Account for views: { header: "headerComponent" } + if (isString(config)) + config = { component: config }; + // Make a shallow copy of the config object + config = extend({}, config); + // Do not allow a view to mix props for component-style view with props for template/controller-style view + if (hasAnyKey(compKeys, config) && hasAnyKey(nonCompKeys, config)) { + throw new Error("Cannot combine: " + compKeys.join("|") + " with: " + nonCompKeys.join("|") + " in stateview: '" + name + "@" + state.name + "'"); + } + config.resolveAs = config.resolveAs || '$resolve'; + config.$type = "ng1"; + config.$context = state; + config.$name = name; + var normalized = ViewService.normalizeUIViewTarget(config.$context, config.$name); + config.$uiViewName = normalized.uiViewName; + config.$uiViewContextAnchor = normalized.uiViewContextAnchor; + views[name] = config; + }); + return views; +} +var id$1 = 0; +var Ng1ViewConfig = /** @class */ (function () { + function Ng1ViewConfig(path, viewDecl, factory) { + var _this = this; + this.path = path; + this.viewDecl = viewDecl; + this.factory = factory; + this.$id = id$1++; + this.loaded = false; + this.getTemplate = function (uiView, context) { + return _this.component ? _this.factory.makeComponentTemplate(uiView, context, _this.component, _this.viewDecl.bindings) : _this.template; + }; + } + Ng1ViewConfig.prototype.load = function () { + var _this = this; + var $q = services.$q; + var context = new ResolveContext(this.path); + var params = this.path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {}); + var promises = { + template: $q.when(this.factory.fromConfig(this.viewDecl, params, context)), + controller: $q.when(this.getController(context)) + }; + return $q.all(promises).then(function (results) { + trace.traceViewServiceEvent("Loaded", _this); + _this.controller = results.controller; + extend(_this, results.template); // Either { template: "tpl" } or { component: "cmpName" } + return _this; + }); + }; + /** + * Gets the controller for a view configuration. + * + * @returns {Function|Promise.} Returns a controller, or a promise that resolves to a controller. + */ + Ng1ViewConfig.prototype.getController = function (context) { + var provider = this.viewDecl.controllerProvider; + if (!isInjectable(provider)) + return this.viewDecl.controller; + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + return Ng1ViewConfig; +}()); + +/** @module view */ +/** for typedoc */ +/** + * Service which manages loading of templates from a ViewConfig. + */ +var TemplateFactory = /** @class */ (function () { + function TemplateFactory() { + var _this = this; + /** @hidden */ this._useHttp = ng.version.minor < 3; + /** @hidden */ this.$get = ['$http', '$templateCache', '$injector', function ($http, $templateCache, $injector) { + _this.$templateRequest = $injector.has && $injector.has('$templateRequest') && $injector.get('$templateRequest'); + _this.$http = $http; + _this.$templateCache = $templateCache; + return _this; + }]; + } + /** @hidden */ + TemplateFactory.prototype.useHttpService = function (value) { + this._useHttp = value; + }; + + /** + * Creates a template from a configuration object. + * + * @param config Configuration object for which to load a template. + * The following properties are search in the specified order, and the first one + * that is defined is used to create the template: + * + * @param params Parameters to pass to the template function. + * @param context The resolve context associated with the template's view + * + * @return {string|object} The template html as a string, or a promise for + * that string,or `null` if no template is configured. + */ + TemplateFactory.prototype.fromConfig = function (config, params, context) { + var defaultTemplate = ""; + var asTemplate = function (result) { return services.$q.when(result).then(function (str) { return ({ template: str }); }); }; + var asComponent = function (result) { return services.$q.when(result).then(function (str) { return ({ component: str }); }); }; + return (isDefined(config.template) ? asTemplate(this.fromString(config.template, params)) : + isDefined(config.templateUrl) ? asTemplate(this.fromUrl(config.templateUrl, params)) : + isDefined(config.templateProvider) ? asTemplate(this.fromProvider(config.templateProvider, params, context)) : + isDefined(config.component) ? asComponent(config.component) : + isDefined(config.componentProvider) ? asComponent(this.fromComponentProvider(config.componentProvider, params, context)) : + asTemplate(defaultTemplate)); + }; + + /** + * Creates a template from a string or a function returning a string. + * + * @param template html template as a string or function that returns an html template as a string. + * @param params Parameters to pass to the template function. + * + * @return {string|object} The template html as a string, or a promise for that + * string. + */ + TemplateFactory.prototype.fromString = function (template, params) { + return isFunction(template) ? template(params) : template; + }; + + /** + * Loads a template from the a URL via `$http` and `$templateCache`. + * + * @param {string|Function} url url of the template to load, or a function + * that returns a url. + * @param {Object} params Parameters to pass to the url function. + * @return {string|Promise.} The template html as a string, or a promise + * for that string. + */ + TemplateFactory.prototype.fromUrl = function (url, params) { + if (isFunction(url)) + url = url(params); + if (url == null) + return null; + if (this._useHttp) { + return this.$http.get(url, { cache: this.$templateCache, headers: { Accept: 'text/html' } }) + .then(function (response) { + return response.data; + }); + } + return this.$templateRequest(url); + }; + + /** + * Creates a template by invoking an injectable provider function. + * + * @param provider Function to invoke via `locals` + * @param {Function} injectFn a function used to invoke the template provider + * @return {string|Promise.} The template html as a string, or a promise + * for that string. + */ + TemplateFactory.prototype.fromProvider = function (provider, params, context) { + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + + /** + * Creates a component's template by invoking an injectable provider function. + * + * @param provider Function to invoke via `locals` + * @param {Function} injectFn a function used to invoke the template provider + * @return {string} The template html as a string: "". + */ + TemplateFactory.prototype.fromComponentProvider = function (provider, params, context) { + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + + /** + * Creates a template from a component's name + * + * This implements route-to-component. + * It works by retrieving the component (directive) metadata from the injector. + * It analyses the component's bindings, then constructs a template that instantiates the component. + * The template wires input and output bindings to resolves or from the parent component. + * + * @param uiView {object} The parent ui-view (for binding outputs to callbacks) + * @param context The ResolveContext (for binding outputs to callbacks returned from resolves) + * @param component {string} Component's name in camel case. + * @param bindings An object defining the component's bindings: {foo: '<'} + * @return {string} The template as a string: "". + */ + TemplateFactory.prototype.makeComponentTemplate = function (uiView, context, component, bindings) { + bindings = bindings || {}; + // Bind once prefix + var prefix = ng.version.minor >= 3 ? "::" : ""; + // Convert to kebob name. Add x- prefix if the string starts with `x-` or `data-` + var kebob = function (camelCase) { + var kebobed = kebobString(camelCase); + return /^(x|data)-/.exec(kebobed) ? "x-" + kebobed : kebobed; + }; + var attributeTpl = function (input) { + var name = input.name, type = input.type; + var attrName = kebob(name); + // If the ui-view has an attribute which matches a binding on the routed component + // then pass that attribute through to the routed component template. + // Prefer ui-view wired mappings to resolve data, unless the resolve was explicitly bound using `bindings:` + if (uiView.attr(attrName) && !bindings[name]) + return attrName + "='" + uiView.attr(attrName) + "'"; + var resolveName = bindings[name] || name; + // Pre-evaluate the expression for "@" bindings by enclosing in {{ }} + // some-attr="{{ ::$resolve.someResolveName }}" + if (type === '@') + return attrName + "='{{" + prefix + "$resolve." + resolveName + "}}'"; + // Wire "&" callbacks to resolves that return a callback function + // Get the result of the resolve (should be a function) and annotate it to get its arguments. + // some-attr="$resolve.someResolveResultName(foo, bar)" + if (type === '&') { + var res = context.getResolvable(resolveName); + var fn = res && res.data; + var args = fn && services.$injector.annotate(fn) || []; + // account for array style injection, i.e., ['foo', function(foo) {}] + var arrayIdxStr = isArray(fn) ? "[" + (fn.length - 1) + "]" : ''; + return attrName + "='$resolve." + resolveName + arrayIdxStr + "(" + args.join(",") + ")'"; + } + // some-attr="::$resolve.someResolveName" + return attrName + "='" + prefix + "$resolve." + resolveName + "'"; + }; + var attrs = getComponentBindings(component).map(attributeTpl).join(" "); + var kebobName = kebob(component); + return "<" + kebobName + " " + attrs + ">"; + }; + + return TemplateFactory; +}()); +// Gets all the directive(s)' inputs ('@', '=', and '<') and outputs ('&') +function getComponentBindings(name) { + var cmpDefs = services.$injector.get(name + "Directive"); // could be multiple + if (!cmpDefs || !cmpDefs.length) + throw new Error("Unable to find component named '" + name + "'"); + return cmpDefs.map(getBindings).reduce(unnestR, []); +} +// Given a directive definition, find its object input attributes +// Use different properties, depending on the type of directive (component, bindToController, normal) +var getBindings = function (def) { + if (isObject(def.bindToController)) + return scopeBindings(def.bindToController); + return scopeBindings(def.scope); +}; +// for ng 1.2 style, process the scope: { input: "=foo" } +// for ng 1.3 through ng 1.5, process the component's bindToController: { input: "=foo" } object +var scopeBindings = function (bindingsObj) { return Object.keys(bindingsObj || {}) + .map(function (key) { return [key, /^([=<@&])[?]?(.*)/.exec(bindingsObj[key])]; }) + .filter(function (tuple) { return isDefined(tuple) && isArray(tuple[1]); }) + .map(function (tuple) { return ({ name: tuple[1][2] || tuple[0], type: tuple[1][1] }); }); }; + +/** @module ng1 */ /** for typedoc */ +/** + * The Angular 1 `StateProvider` + * + * The `$stateProvider` works similar to Angular's v1 router, but it focuses purely + * on state. + * + * A state corresponds to a "place" in the application in terms of the overall UI and + * navigation. A state describes (via the controller / template / view properties) what + * the UI looks like and does at that place. + * + * States often have things in common, and the primary way of factoring out these + * commonalities in this model is via the state hierarchy, i.e. parent/child states aka + * nested states. + * + * The `$stateProvider` provides interfaces to declare these states for your app. + */ +var StateProvider = /** @class */ (function () { + function StateProvider(stateRegistry, stateService) { + this.stateRegistry = stateRegistry; + this.stateService = stateService; + createProxyFunctions(val(StateProvider.prototype), this, val(this)); + } + /** + * Decorates states when they are registered + * + * Allows you to extend (carefully) or override (at your own peril) the + * `stateBuilder` object used internally by [[StateRegistry]]. + * This can be used to add custom functionality to ui-router, + * for example inferring templateUrl based on the state name. + * + * When passing only a name, it returns the current (original or decorated) builder + * function that matches `name`. + * + * The builder functions that can be decorated are listed below. Though not all + * necessarily have a good use case for decoration, that is up to you to decide. + * + * In addition, users can attach custom decorators, which will generate new + * properties within the state's internal definition. There is currently no clear + * use-case for this beyond accessing internal states (i.e. $state.$current), + * however, expect this to become increasingly relevant as we introduce additional + * meta-programming features. + * + * **Warning**: Decorators should not be interdependent because the order of + * execution of the builder functions in non-deterministic. Builder functions + * should only be dependent on the state definition object and super function. + * + * + * Existing builder functions and current return values: + * + * - **parent** `{object}` - returns the parent state object. + * - **data** `{object}` - returns state data, including any inherited data that is not + * overridden by own values (if any). + * - **url** `{object}` - returns a {@link ui.router.util.type:UrlMatcher UrlMatcher} + * or `null`. + * - **navigable** `{object}` - returns closest ancestor state that has a URL (aka is + * navigable). + * - **params** `{object}` - returns an array of state params that are ensured to + * be a super-set of parent's params. + * - **views** `{object}` - returns a views object where each key is an absolute view + * name (i.e. "viewName@stateName") and each value is the config object + * (template, controller) for the view. Even when you don't use the views object + * explicitly on a state config, one is still created for you internally. + * So by decorating this builder function you have access to decorating template + * and controller properties. + * - **ownParams** `{object}` - returns an array of params that belong to the state, + * not including any params defined by ancestor states. + * - **path** `{string}` - returns the full path from the root down to this state. + * Needed for state activation. + * - **includes** `{object}` - returns an object that includes every state that + * would pass a `$state.includes()` test. + * + * #### Example: + * Override the internal 'views' builder with a function that takes the state + * definition, and a reference to the internal function being overridden: + * ```js + * $stateProvider.decorator('views', function (state, parent) { + * let result = {}, + * views = parent(state); + * + * angular.forEach(views, function (config, name) { + * let autoName = (state.name + '.' + name).replace('.', '/'); + * config.templateUrl = config.templateUrl || '/partials/' + autoName + '.html'; + * result[name] = config; + * }); + * return result; + * }); + * + * $stateProvider.state('home', { + * views: { + * 'contact.list': { controller: 'ListController' }, + * 'contact.item': { controller: 'ItemController' } + * } + * }); + * ``` + * + * + * ```js + * // Auto-populates list and item views with /partials/home/contact/list.html, + * // and /partials/home/contact/item.html, respectively. + * $state.go('home'); + * ``` + * + * @param {string} name The name of the builder function to decorate. + * @param {object} func A function that is responsible for decorating the original + * builder function. The function receives two parameters: + * + * - `{object}` - state - The state config object. + * - `{object}` - super - The original builder function. + * + * @return {object} $stateProvider - $stateProvider instance + */ + StateProvider.prototype.decorator = function (name, func) { + return this.stateRegistry.decorator(name, func) || this; + }; + StateProvider.prototype.state = function (name, definition) { + if (isObject(name)) { + definition = name; + } + else { + definition.name = name; + } + this.stateRegistry.register(definition); + return this; + }; + /** + * Registers an invalid state handler + * + * This is a passthrough to [[StateService.onInvalid]] for ng1. + */ + StateProvider.prototype.onInvalid = function (callback) { + return this.stateService.onInvalid(callback); + }; + return StateProvider; +}()); + +/** @module ng1 */ /** */ +/** + * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`, + * `onRetain` callback hooks on a [[Ng1StateDeclaration]]. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * ensures that those hooks are injectable for @uirouter/angularjs (ng1). + */ +var getStateHookBuilder = function (hookName) { + return function stateHookBuilder(state, parentFn) { + var hook = state[hookName]; + var pathname = hookName === 'onExit' ? 'from' : 'to'; + function decoratedNg1Hook(trans, state) { + var resolveContext = new ResolveContext(trans.treeChanges(pathname)); + var locals = extend(getLocals(resolveContext), { $state$: state, $transition$: trans }); + return services.$injector.invoke(hook, this, locals); + } + return hook ? decoratedNg1Hook : undefined; + }; +}; + +/** + * Implements UI-Router LocationServices and LocationConfig using Angular 1's $location service + */ +var Ng1LocationServices = /** @class */ (function () { + function Ng1LocationServices($locationProvider) { + // .onChange() registry + this._urlListeners = []; + this.$locationProvider = $locationProvider; + var _lp = val($locationProvider); + createProxyFunctions(_lp, this, _lp, ['hashPrefix']); + } + Ng1LocationServices.prototype.dispose = function () { }; + Ng1LocationServices.prototype.onChange = function (callback) { + var _this = this; + this._urlListeners.push(callback); + return function () { return removeFrom(_this._urlListeners)(callback); }; + }; + Ng1LocationServices.prototype.html5Mode = function () { + var html5Mode = this.$locationProvider.html5Mode(); + html5Mode = isObject(html5Mode) ? html5Mode.enabled : html5Mode; + return html5Mode && this.$sniffer.history; + }; + Ng1LocationServices.prototype.url = function (newUrl, replace, state) { + if (replace === void 0) { replace = false; } + if (newUrl) + this.$location.url(newUrl); + if (replace) + this.$location.replace(); + if (state) + this.$location.state(state); + return this.$location.url(); + }; + Ng1LocationServices.prototype._runtimeServices = function ($rootScope, $location, $sniffer, $browser) { + var _this = this; + this.$location = $location; + this.$sniffer = $sniffer; + // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange + $rootScope.$on("$locationChangeSuccess", function (evt) { return _this._urlListeners.forEach(function (fn) { return fn(evt); }); }); + var _loc = val($location); + var _browser = val($browser); + // Bind these LocationService functions to $location + createProxyFunctions(_loc, this, _loc, ["replace", "path", "search", "hash"]); + // Bind these LocationConfig functions to $location + createProxyFunctions(_loc, this, _loc, ['port', 'protocol', 'host']); + // Bind these LocationConfig functions to $browser + createProxyFunctions(_browser, this, _browser, ['baseHref']); + }; + /** + * Applys ng1-specific path parameter encoding + * + * The Angular 1 `$location` service is a bit weird. + * It doesn't allow slashes to be encoded/decoded bi-directionally. + * + * See the writeup at https://github.com/angular-ui/ui-router/issues/2598 + * + * This code patches the `path` parameter type so it encoded/decodes slashes as ~2F + * + * @param router + */ + Ng1LocationServices.monkeyPatchPathParameterType = function (router) { + var pathType = router.urlMatcherFactory.type('path'); + pathType.encode = function (val) { + return val != null ? val.toString().replace(/(~|\/)/g, function (m) { return ({ '~': '~~', '/': '~2F' }[m]); }) : val; + }; + pathType.decode = function (val) { + return val != null ? val.toString().replace(/(~~|~2F)/g, function (m) { return ({ '~~': '~', '~2F': '/' }[m]); }) : val; + }; + }; + return Ng1LocationServices; +}()); + +/** @module url */ /** */ +/** + * Manages rules for client-side URL + * + * ### Deprecation warning: + * This class is now considered to be an internal API + * Use the [[UrlService]] instead. + * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]]. + * + * This class manages the router rules for what to do when the URL changes. + * + * This provider remains for backwards compatibility. + * + * @deprecated + */ +var UrlRouterProvider = /** @class */ (function () { + /** @hidden */ + function UrlRouterProvider(router) { + this._router = router; + this._urlRouter = router.urlRouter; + } + /** @hidden */ + UrlRouterProvider.prototype.$get = function () { + var urlRouter = this._urlRouter; + urlRouter.update(true); + if (!urlRouter.interceptDeferred) + urlRouter.listen(); + return urlRouter; + }; + /** + * Registers a url handler function. + * + * Registers a low level url handler (a `rule`). + * A rule detects specific URL patterns and returns a redirect, or performs some action. + * + * If a rule returns a string, the URL is replaced with the string, and all rules are fired again. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * // Here's an example of how you might allow case insensitive urls + * $urlRouterProvider.rule(function ($injector, $location) { + * var path = $location.path(), + * normalized = path.toLowerCase(); + * + * if (path !== normalized) { + * return normalized; + * } + * }); + * }); + * ``` + * + * @param ruleFn + * Handler function that takes `$injector` and `$location` services as arguments. + * You can use them to detect a url and return a different url as a string. + * + * @return [[UrlRouterProvider]] (`this`) + */ + UrlRouterProvider.prototype.rule = function (ruleFn) { + var _this = this; + if (!isFunction(ruleFn)) + throw new Error("'rule' must be a function"); + var match = function () { + return ruleFn(services.$injector, _this._router.locationService); + }; + var rule = new BaseUrlRule(match, identity); + this._urlRouter.rule(rule); + return this; + }; + + /** + * Defines the path or behavior to use when no url can be matched. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * // if the path doesn't match any of the urls you configured + * // otherwise will take care of routing the user to the + * // specified url + * $urlRouterProvider.otherwise('/index'); + * + * // Example of using function rule as param + * $urlRouterProvider.otherwise(function ($injector, $location) { + * return '/a/valid/url'; + * }); + * }); + * ``` + * + * @param rule + * The url path you want to redirect to or a function rule that returns the url path or performs a `$state.go()`. + * The function version is passed two params: `$injector` and `$location` services, and should return a url string. + * + * @return {object} `$urlRouterProvider` - `$urlRouterProvider` instance + */ + UrlRouterProvider.prototype.otherwise = function (rule) { + var _this = this; + var urlRouter = this._urlRouter; + if (isString(rule)) { + urlRouter.otherwise(rule); + } + else if (isFunction(rule)) { + urlRouter.otherwise(function () { return rule(services.$injector, _this._router.locationService); }); + } + else { + throw new Error("'rule' must be a string or function"); + } + return this; + }; + + /** + * Registers a handler for a given url matching. + * + * If the handler is a string, it is + * treated as a redirect, and is interpolated according to the syntax of match + * (i.e. like `String.replace()` for `RegExp`, or like a `UrlMatcher` pattern otherwise). + * + * If the handler is a function, it is injectable. + * It gets invoked if `$location` matches. + * You have the option of inject the match object as `$match`. + * + * The handler can return + * + * - **falsy** to indicate that the rule didn't match after all, then `$urlRouter` + * will continue trying to find another one that matches. + * - **string** which is treated as a redirect and passed to `$location.url()` + * - **void** or any **truthy** value tells `$urlRouter` that the url was handled. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * $urlRouterProvider.when($state.url, function ($match, $stateParams) { + * if ($state.$current.navigable !== state || + * !equalForKeys($match, $stateParams) { + * $state.transitionTo(state, $match, false); + * } + * }); + * }); + * ``` + * + * @param what A pattern string to match, compiled as a [[UrlMatcher]]. + * @param handler The path (or function that returns a path) that you want to redirect your user to. + * @param ruleCallback [optional] A callback that receives the `rule` registered with [[UrlMatcher.rule]] + * + * Note: the handler may also invoke arbitrary code, such as `$state.go()` + */ + UrlRouterProvider.prototype.when = function (what, handler) { + if (isArray(handler) || isFunction(handler)) { + handler = UrlRouterProvider.injectableHandler(this._router, handler); + } + this._urlRouter.when(what, handler); + return this; + }; + + UrlRouterProvider.injectableHandler = function (router, handler) { + return function (match) { + return services.$injector.invoke(handler, null, { $match: match, $stateParams: router.globals.params }); + }; + }; + /** + * Disables monitoring of the URL. + * + * Call this method before UI-Router has bootstrapped. + * It will stop UI-Router from performing the initial url sync. + * + * This can be useful to perform some asynchronous initialization before the router starts. + * Once the initialization is complete, call [[listen]] to tell UI-Router to start watching and synchronizing the URL. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router']); + * + * app.config(function ($urlRouterProvider) { + * // Prevent $urlRouter from automatically intercepting URL changes; + * $urlRouterProvider.deferIntercept(); + * }) + * + * app.run(function (MyService, $urlRouter, $http) { + * $http.get("/stuff").then(function(resp) { + * MyService.doStuff(resp.data); + * $urlRouter.listen(); + * $urlRouter.sync(); + * }); + * }); + * ``` + * + * @param defer Indicates whether to defer location change interception. + * Passing no parameter is equivalent to `true`. + */ + UrlRouterProvider.prototype.deferIntercept = function (defer) { + this._urlRouter.deferIntercept(defer); + }; + + return UrlRouterProvider; +}()); + +/** + * # Angular 1 types + * + * UI-Router core provides various Typescript types which you can use for code completion and validating parameter values, etc. + * The customizations to the core types for Angular UI-Router are documented here. + * + * The optional [[$resolve]] service is also documented here. + * + * @module ng1 + * @preferred + */ +/** for typedoc */ +ng.module("ui.router.angular1", []); +var mod_init = ng.module('ui.router.init', []); +var mod_util = ng.module('ui.router.util', ['ng', 'ui.router.init']); +var mod_rtr = ng.module('ui.router.router', ['ui.router.util']); +var mod_state = ng.module('ui.router.state', ['ui.router.router', 'ui.router.util', 'ui.router.angular1']); +var mod_main = ng.module('ui.router', ['ui.router.init', 'ui.router.state', 'ui.router.angular1']); +var mod_cmpt = ng.module('ui.router.compat', ['ui.router']); // tslint:disable-line +var router = null; +$uiRouter.$inject = ['$locationProvider']; +/** This angular 1 provider instantiates a Router and exposes its services via the angular injector */ +function $uiRouter($locationProvider) { + // Create a new instance of the Router when the $uiRouterProvider is initialized + router = this.router = new UIRouter(); + router.stateProvider = new StateProvider(router.stateRegistry, router.stateService); + // Apply ng1 specific StateBuilder code for `views`, `resolve`, and `onExit/Retain/Enter` properties + router.stateRegistry.decorator("views", ng1ViewsBuilder); + router.stateRegistry.decorator("onExit", getStateHookBuilder("onExit")); + router.stateRegistry.decorator("onRetain", getStateHookBuilder("onRetain")); + router.stateRegistry.decorator("onEnter", getStateHookBuilder("onEnter")); + router.viewService._pluginapi._viewConfigFactory('ng1', getNg1ViewConfigFactory()); + var ng1LocationService = router.locationService = router.locationConfig = new Ng1LocationServices($locationProvider); + Ng1LocationServices.monkeyPatchPathParameterType(router); + // backwards compat: also expose router instance as $uiRouterProvider.router + router['router'] = router; + router['$get'] = $get; + $get.$inject = ['$location', '$browser', '$sniffer', '$rootScope', '$http', '$templateCache']; + function $get($location, $browser, $sniffer, $rootScope, $http, $templateCache) { + ng1LocationService._runtimeServices($rootScope, $location, $sniffer, $browser); + delete router['router']; + delete router['$get']; + return router; + } + return router; +} +var getProviderFor = function (serviceName) { return ['$uiRouterProvider', function ($urp) { + var service = $urp.router[serviceName]; + service["$get"] = function () { return service; }; + return service; + }]; }; +// This effectively calls $get() on `$uiRouterProvider` to trigger init (when ng enters runtime) +runBlock.$inject = ['$injector', '$q', '$uiRouter']; +function runBlock($injector, $q, $uiRouter) { + services.$injector = $injector; + services.$q = $q; + // The $injector is now available. + // Find any resolvables that had dependency annotation deferred + $uiRouter.stateRegistry.get() + .map(function (x) { return x.$$state().resolvables; }) + .reduce(unnestR, []) + .filter(function (x) { return x.deps === "deferred"; }) + .forEach(function (resolvable) { return resolvable.deps = $injector.annotate(resolvable.resolveFn, $injector.strictDi); }); +} +// $urlRouter service and $urlRouterProvider +var getUrlRouterProvider = function (uiRouter) { + return uiRouter.urlRouterProvider = new UrlRouterProvider(uiRouter); +}; +// $state service and $stateProvider +// $urlRouter service and $urlRouterProvider +var getStateProvider = function () { + return extend(router.stateProvider, { $get: function () { return router.stateService; } }); +}; +watchDigests.$inject = ['$rootScope']; +function watchDigests($rootScope) { + $rootScope.$watch(function () { trace.approximateDigests++; }); +} +mod_init.provider("$uiRouter", $uiRouter); +mod_rtr.provider('$urlRouter', ['$uiRouterProvider', getUrlRouterProvider]); +mod_util.provider('$urlService', getProviderFor('urlService')); +mod_util.provider('$urlMatcherFactory', ['$uiRouterProvider', function () { return router.urlMatcherFactory; }]); +mod_util.provider('$templateFactory', function () { return new TemplateFactory(); }); +mod_state.provider('$stateRegistry', getProviderFor('stateRegistry')); +mod_state.provider('$uiRouterGlobals', getProviderFor('globals')); +mod_state.provider('$transitions', getProviderFor('transitionService')); +mod_state.provider('$state', ['$uiRouterProvider', getStateProvider]); +mod_state.factory('$stateParams', ['$uiRouter', function ($uiRouter) { return $uiRouter.globals.params; }]); +mod_main.factory('$view', function () { return router.viewService; }); +mod_main.service("$trace", function () { return trace; }); +mod_main.run(watchDigests); +mod_util.run(['$urlMatcherFactory', function ($urlMatcherFactory) { }]); +mod_state.run(['$state', function ($state) { }]); +mod_rtr.run(['$urlRouter', function ($urlRouter) { }]); +mod_init.run(runBlock); +/** @hidden TODO: find a place to move this */ +var getLocals = function (ctx) { + var tokens = ctx.getTokens().filter(isString); + var tuples = tokens.map(function (key) { + var resolvable = ctx.getResolvable(key); + var waitPolicy = ctx.getPolicy(resolvable).async; + return [key, waitPolicy === 'NOWAIT' ? resolvable.promise : resolvable.data]; + }); + return tuples.reduce(applyPairs, {}); +}; + +/** + * # Angular 1 injectable services + * + * This is a list of the objects which can be injected using angular's injector. + * + * There are three different kind of injectable objects: + * + * ## **Provider** objects + * #### injectable into a `.config()` block during configtime + * + * - [[$uiRouterProvider]]: The UI-Router instance + * - [[$stateProvider]]: State registration + * - [[$transitionsProvider]]: Transition hooks + * - [[$urlServiceProvider]]: All URL related public APIs + * + * - [[$uiViewScrollProvider]]: Disable ui-router view scrolling + * - [[$urlRouterProvider]]: (deprecated) Url matching rules + * - [[$urlMatcherFactoryProvider]]: (deprecated) Url parsing config + * + * ## **Service** objects + * #### injectable globally during runtime + * + * - [[$uiRouter]]: The UI-Router instance + * - [[$trace]]: Enable transition trace/debug + * - [[$transitions]]: Transition hooks + * - [[$state]]: Imperative state related APIs + * - [[$stateRegistry]]: State registration + * - [[$urlService]]: All URL related public APIs + * - [[$uiRouterGlobals]]: Global variables + * - [[$uiViewScroll]]: Scroll an element into view + * + * - [[$stateParams]]: (deprecated) Global state param values + * - [[$urlRouter]]: (deprecated) URL synchronization + * - [[$urlMatcherFactory]]: (deprecated) URL parsing config + * + * ## **Per-Transition** objects + * + * - These kind of objects are injectable into: + * - Resolves ([[Ng1StateDeclaration.resolve]]), + * - Transition Hooks ([[TransitionService.onStart]], etc), + * - Routed Controllers ([[Ng1ViewDeclaration.controller]]) + * + * #### Different instances are injected based on the [[Transition]] + * + * - [[$transition$]]: The current Transition object + * - [[$stateParams]]: State param values for pending Transition (deprecated) + * - Any resolve data defined using [[Ng1StateDeclaration.resolve]] + * + * @ng1api + * @preferred + * @module injectables + */ /** */ +/** + * The current (or pending) State Parameters + * + * An injectable global **Service Object** which holds the state parameters for the latest **SUCCESSFUL** transition. + * + * The values are not updated until *after* a `Transition` successfully completes. + * + * **Also:** an injectable **Per-Transition Object** object which holds the pending state parameters for the pending `Transition` currently running. + * + * ### Deprecation warning: + * + * The value injected for `$stateParams` is different depending on where it is injected. + * + * - When injected into an angular service, the object injected is the global **Service Object** with the parameter values for the latest successful `Transition`. + * - When injected into transition hooks, resolves, or view controllers, the object is the **Per-Transition Object** with the parameter values for the running `Transition`. + * + * Because of these confusing details, this service is deprecated. + * + * ### Instead of using the global `$stateParams` service object, + * inject [[$uiRouterGlobals]] and use [[UIRouterGlobals.params]] + * + * ```js + * MyService.$inject = ['$uiRouterGlobals']; + * function MyService($uiRouterGlobals) { + * return { + * paramValues: function () { + * return $uiRouterGlobals.params; + * } + * } + * } + * ``` + * + * ### Instead of using the per-transition `$stateParams` object, + * inject the current `Transition` (as [[$transition$]]) and use [[Transition.params]] + * + * ```js + * MyController.$inject = ['$transition$']; + * function MyController($transition$) { + * var username = $transition$.params().username; + * // .. do something with username + * } + * ``` + * + * --- + * + * This object can be injected into other services. + * + * #### Deprecated Example: + * ```js + * SomeService.$inject = ['$http', '$stateParams']; + * function SomeService($http, $stateParams) { + * return { + * getUser: function() { + * return $http.get('/api/users/' + $stateParams.username); + * } + * } + * }; + * angular.service('SomeService', SomeService); + * ``` + * @deprecated + */ + +/** + * # Angular 1 Directives + * + * These are the directives included in UI-Router for Angular 1. + * These directives are used in templates to create viewports and link/navigate to states. + * + * @ng1api + * @preferred + * @module directives + */ /** for typedoc */ +/** @hidden */ +function parseStateRef(ref) { + var paramsOnly = ref.match(/^\s*({[^}]*})\s*$/), parsed; + if (paramsOnly) + ref = '(' + paramsOnly[1] + ')'; + parsed = ref.replace(/\n/g, " ").match(/^\s*([^(]*?)\s*(\((.*)\))?\s*$/); + if (!parsed || parsed.length !== 4) + throw new Error("Invalid state ref '" + ref + "'"); + return { state: parsed[1] || null, paramExpr: parsed[3] || null }; +} +/** @hidden */ +function stateContext(el) { + var $uiView = el.parent().inheritedData('$uiView'); + var path = parse('$cfg.path')($uiView); + return path ? tail(path).state.name : undefined; +} +/** @hidden */ +function processedDef($state, $element, def) { + var uiState = def.uiState || $state.current.name; + var uiStateOpts = extend(defaultOpts($element, $state), def.uiStateOpts || {}); + var href = $state.href(uiState, def.uiStateParams, uiStateOpts); + return { uiState: uiState, uiStateParams: def.uiStateParams, uiStateOpts: uiStateOpts, href: href }; +} +/** @hidden */ +function getTypeInfo(el) { + // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. + var isSvg = Object.prototype.toString.call(el.prop('href')) === '[object SVGAnimatedString]'; + var isForm = el[0].nodeName === "FORM"; + return { + attr: isForm ? "action" : (isSvg ? 'xlink:href' : 'href'), + isAnchor: el.prop("tagName").toUpperCase() === "A", + clickable: !isForm + }; +} +/** @hidden */ +function clickHook(el, $state, $timeout, type, getDef) { + return function (e) { + var button = e.which || e.button, target = getDef(); + if (!(button > 1 || e.ctrlKey || e.metaKey || e.shiftKey || el.attr('target'))) { + // HACK: This is to allow ng-clicks to be processed before the transition is initiated: + var transition = $timeout(function () { + $state.go(target.uiState, target.uiStateParams, target.uiStateOpts); + }); + e.preventDefault(); + // if the state has no URL, ignore one preventDefault from the directive. + var ignorePreventDefaultCount = type.isAnchor && !target.href ? 1 : 0; + e.preventDefault = function () { + if (ignorePreventDefaultCount-- <= 0) + $timeout.cancel(transition); + }; + } + }; +} +/** @hidden */ +function defaultOpts(el, $state) { + return { + relative: stateContext(el) || $state.$current, + inherit: true, + source: "sref" + }; +} +/** @hidden */ +function bindEvents(element, scope, hookFn, uiStateOpts) { + var events; + if (uiStateOpts) { + events = uiStateOpts.events; + } + if (!isArray(events)) { + events = ['click']; + } + var on = element.on ? 'on' : 'bind'; + for (var _i = 0, events_1 = events; _i < events_1.length; _i++) { + var event_1 = events_1[_i]; + element[on](event_1, hookFn); + } + scope.$on('$destroy', function () { + var off = element.off ? 'off' : 'unbind'; + for (var _i = 0, events_2 = events; _i < events_2.length; _i++) { + var event_2 = events_2[_i]; + element[off](event_2, hookFn); + } + }); +} +/** + * `ui-sref`: A directive for linking to a state + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * ### Linked State + * The attribute value of the `ui-sref` is the name of the state to link to. + * + * #### Example: + * This will activate the `home` state when the link is clicked. + * ```html + * Home + * ``` + * + * ### Relative Links + * You can also use relative state paths within `ui-sref`, just like a relative path passed to `$state.go()` ([[StateService.go]]). + * You just need to be aware that the path is relative to the state that *created* the link. + * This allows a state to create a relative `ui-sref` which always targets the same destination. + * + * #### Example: + * Both these links are relative to the parent state, even when a child state is currently active. + * ```html + * child 1 state + * child 2 state + * ``` + * + * This link activates the parent state. + * ```html + * Return + * ``` + * + * ### hrefs + * If the linked state has a URL, the directive will automatically generate and + * update the `href` attribute (using the [[StateService.href]] method). + * + * #### Example: + * Assuming the `users` state has a url of `/users/` + * ```html + * Users + * ``` + * + * ### Parameter Values + * In addition to the state name, a `ui-sref` can include parameter values which are applied when activating the state. + * Param values can be provided in the `ui-sref` value after the state name, enclosed by parentheses. + * The content inside the parentheses is an expression, evaluated to the parameter values. + * + * #### Example: + * This example renders a list of links to users. + * The state's `userId` parameter value comes from each user's `user.id` property. + * ```html + *
  • + * {{ user.displayName }} + *
    • + * ``` + * + * Note: + * The parameter values expression is `$watch`ed for updates. + * + * ### Transition Options + * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-sref-opts` attribute. + * Options are restricted to `location`, `inherit`, and `reload`. + * + * #### Example: + * ```html + * Home + * ``` + * + * ### Other DOM Events + * + * You can also customize which DOM events to respond to (instead of `click`) by + * providing an `events` array in the `ui-sref-opts` attribute. + * + * #### Example: + * ```html + * + * ``` + * + * ### Highlighting the active link + * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link. + * + * ### Examples + * If you have the following template: + * + * ```html + * Home + * About + * Next page + * + * + * ``` + * + * Then (assuming the current state is `contacts`) the rendered html including hrefs would be: + * + * ```html + * Home + * About + * Next page + * + *
      + *
    • + * Joe + *
      • + *
    • + * Alice + *
      • + *
    • + * Bob + *
      • + *
    + * + * Home + * ``` + * + * ### Notes + * + * - You can use `ui-sref` to change **only the parameter values** by omitting the state name and parentheses. + * #### Example: + * Sets the `lang` parameter to `en` and remains on the same state. + * + * ```html + * English + * ``` + * + * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example. + * + * - Unlike the parameter values expression, the state name is not `$watch`ed (for performance reasons). + * If you need to dynamically update the state being linked to, use the fully dynamic [[uiState]] directive. + */ +var uiSref; +uiSref = ['$uiRouter', '$timeout', + function $StateRefDirective($uiRouter, $timeout) { + var $state = $uiRouter.stateService; + return { + restrict: 'A', + require: ['?^uiSrefActive', '?^uiSrefActiveEq'], + link: function (scope, element, attrs, uiSrefActive) { + var type = getTypeInfo(element); + var active = uiSrefActive[1] || uiSrefActive[0]; + var unlinkInfoFn = null; + var hookFn; + var rawDef = {}; + var getDef = function () { return processedDef($state, element, rawDef); }; + var ref = parseStateRef(attrs.uiSref); + rawDef.uiState = ref.state; + rawDef.uiStateOpts = attrs.uiSrefOpts ? scope.$eval(attrs.uiSrefOpts) : {}; + function update() { + var def = getDef(); + if (unlinkInfoFn) + unlinkInfoFn(); + if (active) + unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams); + if (def.href != null) + attrs.$set(type.attr, def.href); + } + if (ref.paramExpr) { + scope.$watch(ref.paramExpr, function (val) { + rawDef.uiStateParams = extend({}, val); + update(); + }, true); + rawDef.uiStateParams = extend({}, scope.$eval(ref.paramExpr)); + } + update(); + scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update)); + scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update)); + if (!type.clickable) + return; + hookFn = clickHook(element, $state, $timeout, type, getDef); + bindEvents(element, scope, hookFn, rawDef.uiStateOpts); + } + }; + }]; +/** + * `ui-state`: A fully dynamic directive for linking to a state + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * **This directive is very similar to [[uiSref]], but it `$observe`s and `$watch`es/evaluates all its inputs.** + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * ### Linked State + * The attribute value of `ui-state` is an expression which is `$watch`ed and evaluated as the state to link to. + * **This is in contrast with `ui-sref`, which takes a state name as a string literal.** + * + * #### Example: + * Create a list of links. + * ```html + *
  • + * {{ link.displayName }} + *
    • + * ``` + * + * ### Relative Links + * If the expression evaluates to a relative path, it is processed like [[uiSref]]. + * You just need to be aware that the path is relative to the state that *created* the link. + * This allows a state to create relative `ui-state` which always targets the same destination. + * + * ### hrefs + * If the linked state has a URL, the directive will automatically generate and + * update the `href` attribute (using the [[StateService.href]] method). + * + * ### Parameter Values + * In addition to the state name expression, a `ui-state` can include parameter values which are applied when activating the state. + * Param values should be provided using the `ui-state-params` attribute. + * The `ui-state-params` attribute value is `$watch`ed and evaluated as an expression. + * + * #### Example: + * This example renders a list of links with param values. + * The state's `userId` parameter value comes from each user's `user.id` property. + * ```html + *
  • + * {{ link.displayName }} + *
    • + * ``` + * + * ### Transition Options + * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-state-opts` attribute. + * Options are restricted to `location`, `inherit`, and `reload`. + * The value of the `ui-state-opts` is `$watch`ed and evaluated as an expression. + * + * #### Example: + * ```html + * Home + * ``` + * + * ### Other DOM Events + * + * You can also customize which DOM events to respond to (instead of `click`) by + * providing an `events` array in the `ui-state-opts` attribute. + * + * #### Example: + * ```html + * + * ``` + * + * ### Highlighting the active link + * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link. + * + * ### Notes + * + * - You can use `ui-params` to change **only the parameter values** by omitting the state name and supplying only `ui-state-params`. + * However, it might be simpler to use [[uiSref]] parameter-only links. + * + * #### Example: + * Sets the `lang` parameter to `en` and remains on the same state. + * + * ```html + * English + * ``` + * + * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example. + * ``` + */ +var uiState; +uiState = ['$uiRouter', '$timeout', + function $StateRefDynamicDirective($uiRouter, $timeout) { + var $state = $uiRouter.stateService; + return { + restrict: 'A', + require: ['?^uiSrefActive', '?^uiSrefActiveEq'], + link: function (scope, element, attrs, uiSrefActive) { + var type = getTypeInfo(element); + var active = uiSrefActive[1] || uiSrefActive[0]; + var unlinkInfoFn = null; + var hookFn; + var rawDef = {}; + var getDef = function () { return processedDef($state, element, rawDef); }; + var inputAttrs = ['uiState', 'uiStateParams', 'uiStateOpts']; + var watchDeregFns = inputAttrs.reduce(function (acc, attr) { return (acc[attr] = noop$1, acc); }, {}); + function update() { + var def = getDef(); + if (unlinkInfoFn) + unlinkInfoFn(); + if (active) + unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams); + if (def.href != null) + attrs.$set(type.attr, def.href); + } + inputAttrs.forEach(function (field) { + rawDef[field] = attrs[field] ? scope.$eval(attrs[field]) : null; + attrs.$observe(field, function (expr) { + watchDeregFns[field](); + watchDeregFns[field] = scope.$watch(expr, function (newval) { + rawDef[field] = newval; + update(); + }, true); + }); + }); + update(); + scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update)); + scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update)); + if (!type.clickable) + return; + hookFn = clickHook(element, $state, $timeout, type, getDef); + bindEvents(element, scope, hookFn, rawDef.uiStateOpts); + } + }; + }]; +/** + * `ui-sref-active` and `ui-sref-active-eq`: A directive that adds a CSS class when a `ui-sref` is active + * + * A directive working alongside [[uiSref]] and [[uiState]] to add classes to an element when the + * related directive's state is active (and remove them when it is inactive). + * + * The primary use-case is to highlight the active link in navigation menus, + * distinguishing it from the inactive menu items. + * + * ### Linking to a `ui-sref` or `ui-state` + * `ui-sref-active` can live on the same element as `ui-sref`/`ui-state`, or it can be on a parent element. + * If a `ui-sref-active` is a parent to more than one `ui-sref`/`ui-state`, it will apply the CSS class when **any of the links are active**. + * + * ### Matching + * + * The `ui-sref-active` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state **or any child state is active**. + * This is a "fuzzy match" which uses [[StateService.includes]]. + * + * The `ui-sref-active-eq` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state is directly active (not when child states are active). + * This is an "exact match" which uses [[StateService.is]]. + * + * ### Parameter values + * If the `ui-sref`/`ui-state` includes parameter values, the current parameter values must match the link's values for the link to be highlighted. + * This allows a list of links to the same state with different parameters to be rendered, and the correct one highlighted. + * + * #### Example: + * ```html + *
  • + * {{ user.lastName }} + *
    • + * ``` + * + * ### Examples + * + * Given the following template: + * #### Example: + * ```html + * + * ``` + * + * When the app state is `app.user` (or any child state), + * and contains the state parameter "user" with value "bilbobaggins", + * the resulting HTML will appear as (note the 'active' class): + * + * ```html + * + * ``` + * + * ### Glob mode + * + * It is possible to pass `ui-sref-active` an expression that evaluates to an object. + * The objects keys represent active class names and values represent the respective state names/globs. + * `ui-sref-active` will match if the current active state **includes** any of + * the specified state names/globs, even the abstract ones. + * + * #### Example: + * Given the following template, with "admin" being an abstract state: + * ```html + *
    + * Roles + *
    + * ``` + * + * When the current state is "admin.roles" the "active" class will be applied to both the
    and elements. + * It is important to note that the state names/globs passed to `ui-sref-active` override any state provided by a linked `ui-sref`. + * + * ### Notes: + * + * - The class name is interpolated **once** during the directives link time (any further changes to the + * interpolated value are ignored). + * + * - Multiple classes may be specified in a space-separated format: `ui-sref-active='class1 class2 class3'` + */ +var uiSrefActive; +uiSrefActive = ['$state', '$stateParams', '$interpolate', '$uiRouter', + function $StateRefActiveDirective($state, $stateParams, $interpolate, $uiRouter) { + return { + restrict: "A", + controller: ['$scope', '$element', '$attrs', + function ($scope, $element, $attrs) { + var states = [], activeEqClass, uiSrefActive; + // There probably isn't much point in $observing this + // uiSrefActive and uiSrefActiveEq share the same directive object with some + // slight difference in logic routing + activeEqClass = $interpolate($attrs.uiSrefActiveEq || '', false)($scope); + try { + uiSrefActive = $scope.$eval($attrs.uiSrefActive); + } + catch (e) { + // Do nothing. uiSrefActive is not a valid expression. + // Fall back to using $interpolate below + } + uiSrefActive = uiSrefActive || $interpolate($attrs.uiSrefActive || '', false)($scope); + if (isObject(uiSrefActive)) { + forEach(uiSrefActive, function (stateOrName, activeClass) { + if (isString(stateOrName)) { + var ref = parseStateRef(stateOrName); + addState(ref.state, $scope.$eval(ref.paramExpr), activeClass); + } + }); + } + // Allow uiSref to communicate with uiSrefActive[Equals] + this.$$addStateInfo = function (newState, newParams) { + // we already got an explicit state provided by ui-sref-active, so we + // shadow the one that comes from ui-sref + if (isObject(uiSrefActive) && states.length > 0) { + return; + } + var deregister = addState(newState, newParams, uiSrefActive); + update(); + return deregister; + }; + function updateAfterTransition(trans) { + trans.promise.then(update, noop$1); + } + $scope.$on('$stateChangeSuccess', update); + $scope.$on('$destroy', $uiRouter.transitionService.onStart({}, updateAfterTransition)); + if ($uiRouter.globals.transition) { + updateAfterTransition($uiRouter.globals.transition); + } + function addState(stateName, stateParams, activeClass) { + var state = $state.get(stateName, stateContext($element)); + var stateInfo = { + state: state || { name: stateName }, + params: stateParams, + activeClass: activeClass + }; + states.push(stateInfo); + return function removeState() { + removeFrom(states)(stateInfo); + }; + } + // Update route state + function update() { + var splitClasses = function (str) { + return str.split(/\s/).filter(identity); + }; + var getClasses = function (stateList) { + return stateList.map(function (x) { return x.activeClass; }).map(splitClasses).reduce(unnestR, []); + }; + var allClasses = getClasses(states).concat(splitClasses(activeEqClass)).reduce(uniqR, []); + var fuzzyClasses = getClasses(states.filter(function (x) { return $state.includes(x.state.name, x.params); })); + var exactlyMatchesAny = !!states.filter(function (x) { return $state.is(x.state.name, x.params); }).length; + var exactClasses = exactlyMatchesAny ? splitClasses(activeEqClass) : []; + var addClasses = fuzzyClasses.concat(exactClasses).reduce(uniqR, []); + var removeClasses = allClasses.filter(function (cls) { return !inArray(addClasses, cls); }); + $scope.$evalAsync(function () { + addClasses.forEach(function (className) { return $element.addClass(className); }); + removeClasses.forEach(function (className) { return $element.removeClass(className); }); + }); + } + update(); + }] + }; + }]; +ng.module('ui.router.state') + .directive('uiSref', uiSref) + .directive('uiSrefActive', uiSrefActive) + .directive('uiSrefActiveEq', uiSrefActive) + .directive('uiState', uiState); + +/** @module ng1 */ /** for typedoc */ +/** + * `isState` Filter: truthy if the current state is the parameter + * + * Translates to [[StateService.is]] `$state.is("stateName")`. + * + * #### Example: + * ```html + *
    show if state is 'stateName'
    + * ``` + */ +$IsStateFilter.$inject = ['$state']; +function $IsStateFilter($state) { + var isFilter = function (state, params, options) { + return $state.is(state, params, options); + }; + isFilter.$stateful = true; + return isFilter; +} +/** + * `includedByState` Filter: truthy if the current state includes the parameter + * + * Translates to [[StateService.includes]]` $state.is("fullOrPartialStateName")`. + * + * #### Example: + * ```html + *
    show if state includes 'fullOrPartialStateName'
    + * ``` + */ +$IncludedByStateFilter.$inject = ['$state']; +function $IncludedByStateFilter($state) { + var includesFilter = function (state, params, options) { + return $state.includes(state, params, options); + }; + includesFilter.$stateful = true; + return includesFilter; +} +ng.module('ui.router.state') + .filter('isState', $IsStateFilter) + .filter('includedByState', $IncludedByStateFilter); + +/** + * @ng1api + * @module directives + */ /** for typedoc */ +/** + * `ui-view`: A viewport directive which is filled in by a view from the active state. + * + * ### Attributes + * + * - `name`: (Optional) A view name. + * The name should be unique amongst the other views in the same state. + * You can have views of the same name that live in different states. + * The ui-view can be targeted in a View using the name ([[Ng1StateDeclaration.views]]). + * + * - `autoscroll`: an expression. When it evaluates to true, the `ui-view` will be scrolled into view when it is activated. + * Uses [[$uiViewScroll]] to do the scrolling. + * + * - `onload`: Expression to evaluate whenever the view updates. + * + * #### Example: + * A view can be unnamed or named. + * ```html + * + *
    + * + * + *
    + * + * + * + * ``` + * + * You can only have one unnamed view within any template (or root html). If you are only using a + * single view and it is unnamed then you can populate it like so: + * + * ```html + *
    + * $stateProvider.state("home", { + * template: "

    HELLO!

    " + * }) + * ``` + * + * The above is a convenient shortcut equivalent to specifying your view explicitly with the + * [[Ng1StateDeclaration.views]] config property, by name, in this case an empty name: + * + * ```js + * $stateProvider.state("home", { + * views: { + * "": { + * template: "

    HELLO!

    " + * } + * } + * }) + * ``` + * + * But typically you'll only use the views property if you name your view or have more than one view + * in the same template. There's not really a compelling reason to name a view if its the only one, + * but you could if you wanted, like so: + * + * ```html + *
    + * ``` + * + * ```js + * $stateProvider.state("home", { + * views: { + * "main": { + * template: "

    HELLO!

    " + * } + * } + * }) + * ``` + * + * Really though, you'll use views to set up multiple views: + * + * ```html + *
    + *
    + *
    + * ``` + * + * ```js + * $stateProvider.state("home", { + * views: { + * "": { + * template: "

    HELLO!

    " + * }, + * "chart": { + * template: "" + * }, + * "data": { + * template: "" + * } + * } + * }) + * ``` + * + * #### Examples for `autoscroll`: + * ```html + * + * + * + * + * + * + * + * ``` + * + * Resolve data: + * + * The resolved data from the state's `resolve` block is placed on the scope as `$resolve` (this + * can be customized using [[Ng1ViewDeclaration.resolveAs]]). This can be then accessed from the template. + * + * Note that when `controllerAs` is being used, `$resolve` is set on the controller instance *after* the + * controller is instantiated. The `$onInit()` hook can be used to perform initialization code which + * depends on `$resolve` data. + * + * #### Example: + * ```js + * $stateProvider.state('home', { + * template: '', + * resolve: { + * user: function(UserService) { return UserService.fetchUser(); } + * } + * }); + * ``` + */ +var uiView; +uiView = ['$view', '$animate', '$uiViewScroll', '$interpolate', '$q', + function $ViewDirective($view, $animate, $uiViewScroll, $interpolate, $q) { + function getRenderer(attrs, scope) { + return { + enter: function (element, target, cb) { + if (ng.version.minor > 2) { + $animate.enter(element, null, target).then(cb); + } + else { + $animate.enter(element, null, target, cb); + } + }, + leave: function (element, cb) { + if (ng.version.minor > 2) { + $animate.leave(element).then(cb); + } + else { + $animate.leave(element, cb); + } + } + }; + } + function configsEqual(config1, config2) { + return config1 === config2; + } + var rootData = { + $cfg: { viewDecl: { $context: $view._pluginapi._rootViewContext() } }, + $uiView: {} + }; + var directive = { + count: 0, + restrict: 'ECA', + terminal: true, + priority: 400, + transclude: 'element', + compile: function (tElement, tAttrs, $transclude) { + return function (scope, $element, attrs) { + var previousEl, currentEl, currentScope, unregister, onloadExp = attrs['onload'] || '', autoScrollExp = attrs['autoscroll'], renderer = getRenderer(attrs, scope), viewConfig = undefined, inherited = $element.inheritedData('$uiView') || rootData, name = $interpolate(attrs['uiView'] || attrs['name'] || '')(scope) || '$default'; + var activeUIView = { + $type: 'ng1', + id: directive.count++, + name: name, + fqn: inherited.$uiView.fqn ? inherited.$uiView.fqn + "." + name : name, + config: null, + configUpdated: configUpdatedCallback, + get creationContext() { + var fromParentTagConfig = parse('$cfg.viewDecl.$context')(inherited); + // Allow + // See https://github.com/angular-ui/ui-router/issues/3355 + var fromParentTag = parse('$uiView.creationContext')(inherited); + return fromParentTagConfig || fromParentTag; + } + }; + trace.traceUIViewEvent("Linking", activeUIView); + function configUpdatedCallback(config) { + if (config && !(config instanceof Ng1ViewConfig)) + return; + if (configsEqual(viewConfig, config)) + return; + trace.traceUIViewConfigUpdated(activeUIView, config && config.viewDecl && config.viewDecl.$context); + viewConfig = config; + updateView(config); + } + $element.data('$uiView', { $uiView: activeUIView }); + updateView(); + unregister = $view.registerUIView(activeUIView); + scope.$on("$destroy", function () { + trace.traceUIViewEvent("Destroying/Unregistering", activeUIView); + unregister(); + }); + function cleanupLastView() { + if (previousEl) { + trace.traceUIViewEvent("Removing (previous) el", previousEl.data('$uiView')); + previousEl.remove(); + previousEl = null; + } + if (currentScope) { + trace.traceUIViewEvent("Destroying scope", activeUIView); + currentScope.$destroy(); + currentScope = null; + } + if (currentEl) { + var _viewData_1 = currentEl.data('$uiViewAnim'); + trace.traceUIViewEvent("Animate out", _viewData_1); + renderer.leave(currentEl, function () { + _viewData_1.$$animLeave.resolve(); + previousEl = null; + }); + previousEl = currentEl; + currentEl = null; + } + } + function updateView(config) { + var newScope = scope.$new(); + var animEnter = $q.defer(), animLeave = $q.defer(); + var $uiViewData = { + $cfg: config, + $uiView: activeUIView, + }; + var $uiViewAnim = { + $animEnter: animEnter.promise, + $animLeave: animLeave.promise, + $$animLeave: animLeave + }; + /** + * @ngdoc event + * @name ui.router.state.directive:ui-view#$viewContentLoading + * @eventOf ui.router.state.directive:ui-view + * @eventType emits on ui-view directive scope + * @description + * + * Fired once the view **begins loading**, *before* the DOM is rendered. + * + * @param {Object} event Event object. + * @param {string} viewName Name of the view. + */ + newScope.$emit('$viewContentLoading', name); + var cloned = $transclude(newScope, function (clone) { + clone.data('$uiViewAnim', $uiViewAnim); + clone.data('$uiView', $uiViewData); + renderer.enter(clone, $element, function onUIViewEnter() { + animEnter.resolve(); + if (currentScope) + currentScope.$emit('$viewContentAnimationEnded'); + if (isDefined(autoScrollExp) && !autoScrollExp || scope.$eval(autoScrollExp)) { + $uiViewScroll(clone); + } + }); + cleanupLastView(); + }); + currentEl = cloned; + currentScope = newScope; + /** + * @ngdoc event + * @name ui.router.state.directive:ui-view#$viewContentLoaded + * @eventOf ui.router.state.directive:ui-view + * @eventType emits on ui-view directive scope + * @description * + * Fired once the view is **loaded**, *after* the DOM is rendered. + * + * @param {Object} event Event object. + */ + currentScope.$emit('$viewContentLoaded', config || viewConfig); + currentScope.$eval(onloadExp); + } + }; + } + }; + return directive; + }]; +$ViewDirectiveFill.$inject = ['$compile', '$controller', '$transitions', '$view', '$q', '$timeout']; +/** @hidden */ +function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q, $timeout) { + var getControllerAs = parse('viewDecl.controllerAs'); + var getResolveAs = parse('viewDecl.resolveAs'); + return { + restrict: 'ECA', + priority: -400, + compile: function (tElement) { + var initial = tElement.html(); + tElement.empty(); + return function (scope, $element) { + var data = $element.data('$uiView'); + if (!data) { + $element.html(initial); + $compile($element.contents())(scope); + return; + } + var cfg = data.$cfg || { viewDecl: {}, getTemplate: ng_from_import.noop }; + var resolveCtx = cfg.path && new ResolveContext(cfg.path); + $element.html(cfg.getTemplate($element, resolveCtx) || initial); + trace.traceUIViewFill(data.$uiView, $element.html()); + var link = $compile($element.contents()); + var controller = cfg.controller; + var controllerAs = getControllerAs(cfg); + var resolveAs = getResolveAs(cfg); + var locals = resolveCtx && getLocals(resolveCtx); + scope[resolveAs] = locals; + if (controller) { + var controllerInstance = $controller(controller, extend({}, locals, { $scope: scope, $element: $element })); + if (controllerAs) { + scope[controllerAs] = controllerInstance; + scope[controllerAs][resolveAs] = locals; + } + // TODO: Use $view service as a central point for registering component-level hooks + // Then, when a component is created, tell the $view service, so it can invoke hooks + // $view.componentLoaded(controllerInstance, { $scope: scope, $element: $element }); + // scope.$on('$destroy', () => $view.componentUnloaded(controllerInstance, { $scope: scope, $element: $element })); + $element.data('$ngControllerController', controllerInstance); + $element.children().data('$ngControllerController', controllerInstance); + registerControllerCallbacks($q, $transitions, controllerInstance, scope, cfg); + } + // Wait for the component to appear in the DOM + if (isString(cfg.viewDecl.component)) { + var cmp_1 = cfg.viewDecl.component; + var kebobName = kebobString(cmp_1); + var tagRegexp_1 = new RegExp("^(x-|data-)?" + kebobName + "$", "i"); + var getComponentController = function () { + var directiveEl = [].slice.call($element[0].children) + .filter(function (el) { return el && el.tagName && tagRegexp_1.exec(el.tagName); }); + return directiveEl && ng.element(directiveEl).data("$" + cmp_1 + "Controller"); + }; + var deregisterWatch_1 = scope.$watch(getComponentController, function (ctrlInstance) { + if (!ctrlInstance) + return; + registerControllerCallbacks($q, $transitions, ctrlInstance, scope, cfg); + deregisterWatch_1(); + }); + } + link(scope); + }; + } + }; +} +/** @hidden */ +var hasComponentImpl = typeof ng.module('ui.router')['component'] === 'function'; +/** @hidden incrementing id */ +var _uiCanExitId = 0; +/** @hidden TODO: move these callbacks to $view and/or `/hooks/components.ts` or something */ +function registerControllerCallbacks($q, $transitions, controllerInstance, $scope, cfg) { + // Call $onInit() ASAP + if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) { + controllerInstance.$onInit(); + } + var viewState = tail(cfg.path).state.self; + var hookOptions = { bind: controllerInstance }; + // Add component-level hook for onParamsChange + if (isFunction(controllerInstance.uiOnParamsChanged)) { + var resolveContext = new ResolveContext(cfg.path); + var viewCreationTrans_1 = resolveContext.getResolvable('$transition$').data; + // Fire callback on any successful transition + var paramsUpdated = function ($transition$) { + // Exit early if the $transition$ is the same as the view was created within. + // Exit early if the $transition$ will exit the state the view is for. + if ($transition$ === viewCreationTrans_1 || $transition$.exiting().indexOf(viewState) !== -1) + return; + var toParams = $transition$.params("to"); + var fromParams = $transition$.params("from"); + var toSchema = $transition$.treeChanges().to.map(function (node) { return node.paramSchema; }).reduce(unnestR, []); + var fromSchema = $transition$.treeChanges().from.map(function (node) { return node.paramSchema; }).reduce(unnestR, []); + // Find the to params that have different values than the from params + var changedToParams = toSchema.filter(function (param) { + var idx = fromSchema.indexOf(param); + return idx === -1 || !fromSchema[idx].type.equals(toParams[param.id], fromParams[param.id]); + }); + // Only trigger callback if a to param has changed or is new + if (changedToParams.length) { + var changedKeys_1 = changedToParams.map(function (x) { return x.id; }); + // Filter the params to only changed/new to params. `$transition$.params()` may be used to get all params. + var newValues = filter(toParams, function (val, key) { return changedKeys_1.indexOf(key) !== -1; }); + controllerInstance.uiOnParamsChanged(newValues, $transition$); + } + }; + $scope.$on('$destroy', $transitions.onSuccess({}, paramsUpdated, hookOptions)); + } + // Add component-level hook for uiCanExit + if (isFunction(controllerInstance.uiCanExit)) { + var id_1 = _uiCanExitId++; + var cacheProp_1 = '_uiCanExitIds'; + // Returns true if a redirect transition already answered truthy + var prevTruthyAnswer_1 = function (trans) { + return !!trans && (trans[cacheProp_1] && trans[cacheProp_1][id_1] === true || prevTruthyAnswer_1(trans.redirectedFrom())); + }; + // If a user answered yes, but the transition was later redirected, don't also ask for the new redirect transition + var wrappedHook = function (trans) { + var promise, ids = trans[cacheProp_1] = trans[cacheProp_1] || {}; + if (!prevTruthyAnswer_1(trans)) { + promise = $q.when(controllerInstance.uiCanExit(trans)); + promise.then(function (val) { return ids[id_1] = (val !== false); }); + } + return promise; + }; + var criteria = { exiting: viewState.name }; + $scope.$on('$destroy', $transitions.onBefore(criteria, wrappedHook, hookOptions)); + } +} +ng.module('ui.router.state').directive('uiView', uiView); +ng.module('ui.router.state').directive('uiView', $ViewDirectiveFill); + +/** @module ng1 */ /** */ +/** @hidden */ +function $ViewScrollProvider() { + var useAnchorScroll = false; + this.useAnchorScroll = function () { + useAnchorScroll = true; + }; + this.$get = ['$anchorScroll', '$timeout', function ($anchorScroll, $timeout) { + if (useAnchorScroll) { + return $anchorScroll; + } + return function ($element) { + return $timeout(function () { + $element[0].scrollIntoView(); + }, 0, false); + }; + }]; +} +ng.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider); + +/** + * Main entry point for angular 1.x build + * @module ng1 + */ /** */ +var index = "ui.router"; + +exports['default'] = index; +exports.core = index$1; +exports.watchDigests = watchDigests; +exports.getLocals = getLocals; +exports.getNg1ViewConfigFactory = getNg1ViewConfigFactory; +exports.ng1ViewsBuilder = ng1ViewsBuilder; +exports.Ng1ViewConfig = Ng1ViewConfig; +exports.StateProvider = StateProvider; +exports.UrlRouterProvider = UrlRouterProvider; +exports.root = root; +exports.fromJson = fromJson; +exports.toJson = toJson; +exports.forEach = forEach; +exports.extend = extend; +exports.equals = equals; +exports.identity = identity; +exports.noop = noop$1; +exports.createProxyFunctions = createProxyFunctions; +exports.inherit = inherit; +exports.inArray = inArray; +exports._inArray = _inArray; +exports.removeFrom = removeFrom; +exports._removeFrom = _removeFrom; +exports.pushTo = pushTo; +exports._pushTo = _pushTo; +exports.deregAll = deregAll; +exports.defaults = defaults; +exports.mergeR = mergeR; +exports.ancestors = ancestors; +exports.pick = pick; +exports.omit = omit; +exports.pluck = pluck; +exports.filter = filter; +exports.find = find; +exports.mapObj = mapObj; +exports.map = map; +exports.values = values; +exports.allTrueR = allTrueR; +exports.anyTrueR = anyTrueR; +exports.unnestR = unnestR; +exports.flattenR = flattenR; +exports.pushR = pushR; +exports.uniqR = uniqR; +exports.unnest = unnest; +exports.flatten = flatten; +exports.assertPredicate = assertPredicate; +exports.assertMap = assertMap; +exports.assertFn = assertFn; +exports.pairs = pairs; +exports.arrayTuples = arrayTuples; +exports.applyPairs = applyPairs; +exports.tail = tail; +exports.copy = copy; +exports._extend = _extend; +exports.silenceUncaughtInPromise = silenceUncaughtInPromise; +exports.silentRejection = silentRejection; +exports.notImplemented = notImplemented; +exports.services = services; +exports.Glob = Glob; +exports.curry = curry; +exports.compose = compose; +exports.pipe = pipe; +exports.prop = prop; +exports.propEq = propEq; +exports.parse = parse; +exports.not = not; +exports.and = and; +exports.or = or; +exports.all = all; +exports.any = any; +exports.is = is; +exports.eq = eq; +exports.val = val; +exports.invoke = invoke; +exports.pattern = pattern; +exports.isUndefined = isUndefined; +exports.isDefined = isDefined; +exports.isNull = isNull; +exports.isNullOrUndefined = isNullOrUndefined; +exports.isFunction = isFunction; +exports.isNumber = isNumber; +exports.isString = isString; +exports.isObject = isObject; +exports.isArray = isArray; +exports.isDate = isDate; +exports.isRegExp = isRegExp; +exports.isState = isState; +exports.isInjectable = isInjectable; +exports.isPromise = isPromise; +exports.Queue = Queue; +exports.maxLength = maxLength; +exports.padString = padString; +exports.kebobString = kebobString; +exports.functionToString = functionToString; +exports.fnToString = fnToString; +exports.stringify = stringify; +exports.beforeAfterSubstr = beforeAfterSubstr; +exports.hostRegex = hostRegex; +exports.stripFile = stripFile; +exports.splitHash = splitHash; +exports.splitQuery = splitQuery; +exports.splitEqual = splitEqual; +exports.trimHashVal = trimHashVal; +exports.splitOnDelim = splitOnDelim; +exports.joinNeighborsR = joinNeighborsR; +exports.Trace = Trace; +exports.trace = trace; +exports.Param = Param; +exports.ParamTypes = ParamTypes; +exports.StateParams = StateParams; +exports.ParamType = ParamType; +exports.PathNode = PathNode; +exports.PathUtils = PathUtils; +exports.resolvePolicies = resolvePolicies; +exports.defaultResolvePolicy = defaultResolvePolicy; +exports.Resolvable = Resolvable; +exports.NATIVE_INJECTOR_TOKEN = NATIVE_INJECTOR_TOKEN; +exports.ResolveContext = ResolveContext; +exports.resolvablesBuilder = resolvablesBuilder; +exports.StateBuilder = StateBuilder; +exports.StateObject = StateObject; +exports.StateMatcher = StateMatcher; +exports.StateQueueManager = StateQueueManager; +exports.StateRegistry = StateRegistry; +exports.StateService = StateService; +exports.TargetState = TargetState; +exports.HookBuilder = HookBuilder; +exports.matchState = matchState; +exports.RegisteredHook = RegisteredHook; +exports.makeEvent = makeEvent; +exports.Rejection = Rejection; +exports.Transition = Transition; +exports.TransitionHook = TransitionHook; +exports.TransitionEventType = TransitionEventType; +exports.defaultTransOpts = defaultTransOpts; +exports.TransitionService = TransitionService; +exports.UrlMatcher = UrlMatcher; +exports.UrlMatcherFactory = UrlMatcherFactory; +exports.UrlRouter = UrlRouter; +exports.UrlRuleFactory = UrlRuleFactory; +exports.BaseUrlRule = BaseUrlRule; +exports.UrlService = UrlService; +exports.ViewService = ViewService; +exports.UIRouterGlobals = UIRouterGlobals; +exports.UIRouter = UIRouter; +exports.$q = $q; +exports.$injector = $injector; +exports.BaseLocationServices = BaseLocationServices; +exports.HashLocationService = HashLocationService; +exports.MemoryLocationService = MemoryLocationService; +exports.PushStateLocationService = PushStateLocationService; +exports.MemoryLocationConfig = MemoryLocationConfig; +exports.BrowserLocationConfig = BrowserLocationConfig; +exports.keyValsToObjectR = keyValsToObjectR; +exports.getParams = getParams; +exports.parseUrl = parseUrl$1; +exports.buildUrl = buildUrl; +exports.locationPluginFactory = locationPluginFactory; +exports.servicesPlugin = servicesPlugin; +exports.hashLocationPlugin = hashLocationPlugin; +exports.pushStateLocationPlugin = pushStateLocationPlugin; +exports.memoryLocationPlugin = memoryLocationPlugin; +exports.UIRouterPluginBase = UIRouterPluginBase; + +Object.defineProperty(exports, '__esModule', { value: true }); + +}))); +//# sourceMappingURL=angular-ui-router.js.map diff --git a/webchat/video/video.html b/webchat/video/video.html new file mode 100644 index 000000000..e69de29bb diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html new file mode 100644 index 000000000..e69de29bb From 143fa04e3ab4d1998545f076a8138131e3acf5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 2 Dec 2018 19:33:24 -0300 Subject: [PATCH 010/237] Add $urlRouterProvider --- webchat/app.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 0e4d330c8..108e4ce22 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -5,7 +5,7 @@ 'ui.router', ]); - app.config(function($stateProvider) { + app.config(function($stateProvider, $urlRouterProvider) { $stateProvider .state("webchat", { abstract: true, @@ -51,7 +51,11 @@ controller: "LoginController as controller", }, }, - }) + }); + + $urlRouterProvider.otherwise("/"); + + }); (function main() { From dcdbbe25639eec75dce5c29c4f276594abf6d5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 2 Dec 2018 19:35:50 -0300 Subject: [PATCH 011/237] Add redirect to call view --- frontend/sw.js | 2 +- webchat/app.js | 9 +++++++++ webchat/call/call.html | 0 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 webchat/call/call.html diff --git a/frontend/sw.js b/frontend/sw.js index b8bb9a801..a745db7a7 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'webchat'; + const CACHE_SUFIX = 'webchat-ui-router'; let messaging; diff --git a/webchat/app.js b/webchat/app.js index 108e4ce22..530a733a9 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -34,6 +34,15 @@ }, }, }) + .state("webchat.call", { + url: "/call", + views: { + content: { + templateUrl: "app/video/call.html", + controller: "CallController as controller", + }, + }, + }) .state("webchat.video", { url: "/video", views: { diff --git a/webchat/call/call.html b/webchat/call/call.html new file mode 100644 index 000000000..e69de29bb From b8a2facfadcedf1162bfc0bca2e9dcf9b96b43c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 2 Dec 2018 08:24:55 -0300 Subject: [PATCH 012/237] Change CACHE_SUFIX to be master --- frontend/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/sw.js b/frontend/sw.js index a745db7a7..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'webchat-ui-router'; + const CACHE_SUFIX = 'master'; let messaging; From 993bd3bded089ad51dabe716de203af9f6039b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 2 Dec 2018 08:26:52 -0300 Subject: [PATCH 013/237] Remove some whitespaces --- webchat/app.js | 1 - webchat/index.html | 1 - 2 files changed, 2 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 530a733a9..e61ac56e4 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -64,7 +64,6 @@ $urlRouterProvider.otherwise("/"); - }); (function main() { diff --git a/webchat/index.html b/webchat/index.html index d8ab61237..1c4ec9d8d 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -70,6 +70,5 @@ - From 413cf0e6203d1499c19a2e8ccfd14d61a880fa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 4 Dec 2018 17:07:11 -0300 Subject: [PATCH 014/237] Set esversion on jshint to es6 --- .jshintrc | 3 ++- webchat/app.js | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.jshintrc b/.jshintrc index 1404a8ba8..eca7516f7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -24,5 +24,6 @@ "jsonpatch", "CryptoJS", "firebase" - ] + ], + "esversion": 6 } \ No newline at end of file diff --git a/webchat/app.js b/webchat/app.js index e61ac56e4..511b89597 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -66,7 +66,10 @@ }); - (function main() { + const main = () => { console.log("app running"); - })(); + }; + + main(); + })(); \ No newline at end of file From 50b4ed7990d8e20f0ddcb03567270bcac1e9c63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 4 Dec 2018 17:08:41 -0300 Subject: [PATCH 015/237] Add states constant to app --- webchat/app.js | 33 +++++++++++++++++++++++---------- webchat/index.html | 2 +- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 511b89597..728972f9b 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -1,13 +1,26 @@ -'use strict'; - (function() { - var app = angular.module('app', [ + 'use strict'; + + const app = angular.module('webchat', [ 'ui.router', ]); - app.config(function($stateProvider, $urlRouterProvider) { + const rootName = 'webchat'; + app.constant('WEBCHAT', { + states: { + abstract: 'webchat', + home: `${rootName}.home`, + call: `${rootName}.call`, + chat: `${rootName}.chat`, + video: `${rootName}.video`, + login: 'login', + }, + currentUser: null, + }); + + app.config((WEBCHAT, $stateProvider, $urlRouterProvider) => { $stateProvider - .state("webchat", { + .state(WEBCHAT.states.abstract, { abstract: true, views: { main: { @@ -16,7 +29,7 @@ }, }, }) - .state("webchat.home", { + .state(WEBCHAT.states.home, { url: "/", views: { content: { @@ -25,7 +38,7 @@ }, }, }) - .state("webchat.chat", { + .state(WEBCHAT.states.chat, { url: "/chat", views: { content: { @@ -34,7 +47,7 @@ }, }, }) - .state("webchat.call", { + .state(WEBCHAT.states.call, { url: "/call", views: { content: { @@ -43,7 +56,7 @@ }, }, }) - .state("webchat.video", { + .state(WEBCHAT.states.video, { url: "/video", views: { content: { @@ -52,7 +65,7 @@ }, }, }) - .state("login", { + .state(WEBCHAT.states.login, { url: "/login", views: { main: { diff --git a/webchat/index.html b/webchat/index.html index 1c4ec9d8d..a88e35a65 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -26,7 +26,7 @@ - +
    From 20cd25e5b2704188022e205c64b7fc6cdddfeed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 4 Dec 2018 17:11:12 -0300 Subject: [PATCH 016/237] Add views controller structure --- webchat/auth/loginController.js | 17 +++++++++++++++++ webchat/call/callController.js | 17 +++++++++++++++++ webchat/chat/chatController.js | 17 +++++++++++++++++ webchat/home/home.html | 1 + webchat/home/homeController.js | 17 +++++++++++++++++ webchat/index.html | 6 ++++++ webchat/video/videoController.js | 17 +++++++++++++++++ webchat/webchat/webchat.html | 2 ++ webchat/webchat/webchatController.js | 17 +++++++++++++++++ 9 files changed, 111 insertions(+) create mode 100644 webchat/auth/loginController.js create mode 100644 webchat/call/callController.js create mode 100644 webchat/chat/chatController.js create mode 100644 webchat/home/homeController.js create mode 100644 webchat/video/videoController.js create mode 100644 webchat/webchat/webchatController.js diff --git a/webchat/auth/loginController.js b/webchat/auth/loginController.js new file mode 100644 index 000000000..d708404ba --- /dev/null +++ b/webchat/auth/loginController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('LoginController', function LoginController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('LoginController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file diff --git a/webchat/call/callController.js b/webchat/call/callController.js new file mode 100644 index 000000000..5a745dc66 --- /dev/null +++ b/webchat/call/callController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('CallController', function CallController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('CallController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file diff --git a/webchat/chat/chatController.js b/webchat/chat/chatController.js new file mode 100644 index 000000000..134b76a4a --- /dev/null +++ b/webchat/chat/chatController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('ChatController', function ChatController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('ChatController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file diff --git a/webchat/home/home.html b/webchat/home/home.html index e69de29bb..987cac423 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -0,0 +1 @@ +

    HOME

    \ No newline at end of file diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js new file mode 100644 index 000000000..835647edf --- /dev/null +++ b/webchat/home/homeController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('HomeController', function HomeController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('HomeController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index a88e35a65..16f8692d2 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -70,5 +70,11 @@ + + + + + + diff --git a/webchat/video/videoController.js b/webchat/video/videoController.js new file mode 100644 index 000000000..cdfd422f4 --- /dev/null +++ b/webchat/video/videoController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('VideoController', function VideoController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('VideoController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html index e69de29bb..74aab521f 100644 --- a/webchat/webchat/webchat.html +++ b/webchat/webchat/webchat.html @@ -0,0 +1,2 @@ +

    WEBCHAT

    +
    \ No newline at end of file diff --git a/webchat/webchat/webchatController.js b/webchat/webchat/webchatController.js new file mode 100644 index 000000000..dccb31f83 --- /dev/null +++ b/webchat/webchat/webchatController.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('WebchatController', function WebchatController ($scope, $state) { + const controller = this; + + const main = () => { + console.log('WebchatController running'); + }; + + main(); + + }); + +})(); \ No newline at end of file From 0a6bf18e998b555c93c9aa420dcb569b73b5b96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 4 Dec 2018 17:54:24 -0300 Subject: [PATCH 017/237] Change general (WEBCHAT) constant to specific (STATE) constant --- webchat/app.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 728972f9b..4e7c5b621 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -6,21 +6,18 @@ ]); const rootName = 'webchat'; - app.constant('WEBCHAT', { - states: { + app.constant('STATES', { abstract: 'webchat', home: `${rootName}.home`, call: `${rootName}.call`, chat: `${rootName}.chat`, video: `${rootName}.video`, login: 'login', - }, - currentUser: null, - }); + }); - app.config((WEBCHAT, $stateProvider, $urlRouterProvider) => { + app.config((STATES, $stateProvider, $urlRouterProvider) => { $stateProvider - .state(WEBCHAT.states.abstract, { + .state(STATES.abstract, { abstract: true, views: { main: { @@ -29,7 +26,7 @@ }, }, }) - .state(WEBCHAT.states.home, { + .state(STATES.home, { url: "/", views: { content: { @@ -38,7 +35,7 @@ }, }, }) - .state(WEBCHAT.states.chat, { + .state(STATES.chat, { url: "/chat", views: { content: { @@ -47,7 +44,7 @@ }, }, }) - .state(WEBCHAT.states.call, { + .state(STATES.call, { url: "/call", views: { content: { @@ -56,7 +53,7 @@ }, }, }) - .state(WEBCHAT.states.video, { + .state(STATES.video, { url: "/video", views: { content: { @@ -65,7 +62,7 @@ }, }, }) - .state(WEBCHAT.states.login, { + .state(STATES.login, { url: "/login", views: { main: { From a16fac62285a52c7ba975bce4af012663287a4fc Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 5 Dec 2018 13:00:26 -0300 Subject: [PATCH 018/237] Add compatible sed to ecis script --- ecis | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/ecis b/ecis index c7f42fbbe..3de40ca3a 100755 --- a/ecis +++ b/ecis @@ -77,10 +77,11 @@ function set_config_file { url=$3; service_name=$4; - sed -i "$line s|.*| $service: '$url',|" $FRONTEND_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $SUPPORT_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $LANDINGPAGE_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $WEBCHAT_CONFIG_FILE + tmpfile=$(mktemp) + sed "$line s|.*| $service: '$url',|" $FRONTEND_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $FRONTEND_CONFIG_FILE + sed "$line s|.*| $service: '$url',|" $SUPPORT_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $SUPPORT_CONFIG_FILE + sed "$line s|.*| $service: '$url',|" $LANDINGPAGE_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $LANDINGPAGE_CONFIG_FILE + sed "$line s|.*| $service: '$url',|" $WEBCHAT_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $WEBCHAT_CONFIG_FILE catch_error $? "Frontend will use ${bold}$url${_bold} as $service_name." catch_error $? "Support will use ${bold}$url${_bold} as $service_name." @@ -91,7 +92,7 @@ function set_backend_url { service="BACKEND_URL"; line=4; service_name="backend"; - set_config_file $line $service $url $service_name; + set_config_file $line $service $url $service_name; } function set_landingpage_url { @@ -127,18 +128,20 @@ function set_webchat_url { } function set_app_version_config { - sed -i "9s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE + tmpfile=$(mktemp) + sed "9s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $FRONTEND_CONFIG_FILE catch_error $? "APP VERSION on Frontend $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE + sed "9s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $SUPPORT_CONFIG_FILE catch_error $? "APP VERSION on Support $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE + sed "9s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $LANDINGPAGE_CONFIG_FILE catch_error $? "APP VERSION on LandingPage $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $WEBCHAT_CONFIG_FILE + sed "9s|.*| APP_VERSION: '$1'|" $WEBCHAT_CONFIG_FILE > "$tmpfile" && mv "$tmpfile" $WEBCHAT_CONFIG_FILE catch_error $? "APP VERSION on LandingPage $1" } function set_cache_suffix_sw { - sed -i "10s|.*| const CACHE_SUFIX = '$1';|" $SW_FILE + tmpfile=$(mktemp) + sed "10s|.*| const CACHE_SUFIX = '$1';|" $SW_FILE > "$tmpfile" && mv "$tmpfile" $SW_FILE catch_error $? "CACHE_SUFIX on SW $1" } @@ -251,7 +254,7 @@ case "$1" in if [ "$3" == "--clean" ]; then rm -rf node_modules bower_components fi - + if [ ! -e node_modules ]; then yarn add package.json catch_error $? "Node modules installed with success" @@ -276,7 +279,7 @@ case "$1" in echo "=========== Starting Backend Tests ===========" source $PY_ENV/bin/activate setup_app_version "master" - + cd backend echo 'FIREBASE_URL = "FIREBASE_URL"' > firebase_config.py echo 'SERVER_KEY = "SERVER_KEY"' >> firebase_config.py @@ -342,9 +345,9 @@ case "$1" in DOMAIN="$APP_NAME.appspot.com" BACKEND_DOMAIN="backend-dot-$DOMAIN" - + ENVIRONMENT="development" - read -p "${bold}Choose which environment to use: (development) ${_bold} " NEW_ENVIRONMENT + read -p "${bold}Choose which environment to use: (development) ${_bold} " NEW_ENVIRONMENT if [ "$NEW_ENVIRONMENT" != "" ]; then ENVIRONMENT=$NEW_ENVIRONMENT fi From 3c9dfce91d6cb158c889384e9baf2f76759a4f49 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 5 Dec 2018 13:04:46 -0300 Subject: [PATCH 019/237] Add icons, logo and base login.css --- webchat/auth/login.css | 49 ++++++++++++++++++++++ webchat/icons/facebook-icon.svg | 37 ++++++++++++++++ webchat/icons/google-icon.svg | 72 ++++++++++++++++++++++++++++++++ webchat/icons/twitter-icon.svg | 38 +++++++++++++++++ webchat/images/logowithname.png | Bin 0 -> 82243 bytes 5 files changed, 196 insertions(+) create mode 100644 webchat/auth/login.css create mode 100644 webchat/icons/facebook-icon.svg create mode 100644 webchat/icons/google-icon.svg create mode 100644 webchat/icons/twitter-icon.svg create mode 100644 webchat/images/logowithname.png diff --git a/webchat/auth/login.css b/webchat/auth/login.css new file mode 100644 index 000000000..f89c09150 --- /dev/null +++ b/webchat/auth/login.css @@ -0,0 +1,49 @@ +.login-btn { + margin: 0 0 1em auto; + text-align: left; + color: white; + width: 100%; +} + +.login-btn md-icon { + margin: 0 0.5em; + color: white; +} + +.login-text { + text-align: justify; +} + +.login-form { + margin: 1em 0; +} + +.login-card { + max-height: 96vh; + padding: 2em; +} + +.limit-width { + max-width: 480px; +} + +img.ec-logo { + width: 80%; + margin: 1em; +} + +.login-card-footer { + background-color: #E6E6E6; +} + +@media screen and (max-width: 320px) { + #login-logo { + width: 80%; + } +} + +@media screen and (max-width: 420px) { + .login-card-content { + width: 92%; + } +} diff --git a/webchat/icons/facebook-icon.svg b/webchat/icons/facebook-icon.svg new file mode 100644 index 000000000..1b9d17dae --- /dev/null +++ b/webchat/icons/facebook-icon.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webchat/icons/google-icon.svg b/webchat/icons/google-icon.svg new file mode 100644 index 000000000..800402771 --- /dev/null +++ b/webchat/icons/google-icon.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webchat/icons/twitter-icon.svg b/webchat/icons/twitter-icon.svg new file mode 100644 index 000000000..ecc520f50 --- /dev/null +++ b/webchat/icons/twitter-icon.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webchat/images/logowithname.png b/webchat/images/logowithname.png new file mode 100644 index 0000000000000000000000000000000000000000..f27b230718ac9cc754154cddd71fb71a6f06fd7c GIT binary patch literal 82243 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 `G&Zr(sY`4DrBh6xy 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 Date: Wed, 12 Dec 2018 09:11:47 -0300 Subject: [PATCH 020/237] Add login page and loginCard component --- webchat/app.js | 12 +++++- webchat/auth/login.css | 53 ++++++++++++++------------ webchat/auth/login.html | 3 ++ webchat/auth/loginCard.html | 66 +++++++++++++++++++++++++++++++++ webchat/auth/loginCard.js | 35 +++++++++++++++++ webchat/auth/loginController.js | 6 ++- webchat/ecis.css | 10 +++++ webchat/home/home.html | 2 +- webchat/home/homeController.js | 4 +- webchat/index.html | 16 +++++--- 10 files changed, 172 insertions(+), 35 deletions(-) create mode 100644 webchat/auth/loginCard.html create mode 100644 webchat/auth/loginCard.js create mode 100644 webchat/ecis.css diff --git a/webchat/app.js b/webchat/app.js index 4e7c5b621..b337c66df 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -3,6 +3,7 @@ const app = angular.module('webchat', [ 'ui.router', + 'ngMaterial' ]); const rootName = 'webchat'; @@ -15,7 +16,14 @@ login: 'login', }); - app.config((STATES, $stateProvider, $urlRouterProvider) => { + app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider) => { + $mdIconProvider.fontSet('md', 'material-icons'); + $mdThemingProvider.theme('docs-dark'); + $mdThemingProvider.theme('input') + .primaryPalette('green'); + $mdThemingProvider.theme('dialogTheme') + .primaryPalette('teal'); + $stateProvider .state(STATES.abstract, { abstract: true, @@ -82,4 +90,4 @@ main(); -})(); \ No newline at end of file +})(); diff --git a/webchat/auth/login.css b/webchat/auth/login.css index f89c09150..38537839a 100644 --- a/webchat/auth/login.css +++ b/webchat/auth/login.css @@ -1,35 +1,46 @@ +img.ec-logo { + width: 80%; + margin: 1em; +} + +.limit-width { + max-width: 480px; +} + .login-btn { margin: 0 0 1em auto; - text-align: left; - color: white; width: 100%; } .login-btn md-icon { - margin: 0 0.5em; color: white; + margin-right: 0.5em; + text-align: center; } -.login-text { - text-align: justify; +#login-invite-icon { + font-size: 1.3em; + line-height: 24px; + margin-left: 0.3em; } -.login-form { - margin: 1em 0; +#login-google-icon { + margin-left: 0.5em; } -.login-card { - max-height: 96vh; - padding: 2em; +#login-google-icon svg { + height: auto; + width: 1.3em; + line-height: auto; + margin: 0.155em 0.2em; } -.limit-width { - max-width: 480px; +.login-text { + text-align: justify; } -img.ec-logo { - width: 80%; - margin: 1em; +.login-form { + margin: 1em 0; } .login-card-footer { @@ -37,13 +48,7 @@ img.ec-logo { } @media screen and (max-width: 320px) { - #login-logo { - width: 80%; - } -} - -@media screen and (max-width: 420px) { - .login-card-content { - width: 92%; - } + img.ec-logo { + width: 60%; + } } diff --git a/webchat/auth/login.html b/webchat/auth/login.html index e69de29bb..98e7f132c 100644 --- a/webchat/auth/login.html +++ b/webchat/auth/login.html @@ -0,0 +1,3 @@ + + + diff --git a/webchat/auth/loginCard.html b/webchat/auth/loginCard.html new file mode 100644 index 000000000..0318e4277 --- /dev/null +++ b/webchat/auth/loginCard.html @@ -0,0 +1,66 @@ + +
    + + + + diff --git a/webchat/auth/loginCard.js b/webchat/auth/loginCard.js new file mode 100644 index 000000000..4133fe15d --- /dev/null +++ b/webchat/auth/loginCard.js @@ -0,0 +1,35 @@ +'use strict'; + +(function() { + function LoginCardController() { + let ctrl = this; + ctrl.user = {}; + + ctrl.signIn = () => { + // login with AuthService + ctrl.onLogin(); + } + + ctrl.$onInit = () => { + if (angular.isUndefined(ctrl.email) || ctrl.email === null) + ctrl.email = true; + if (angular.isUndefined(ctrl.google) || ctrl.google === null) + ctrl.google = true; + if (angular.isUndefined(ctrl.email) || ctrl.invite === null) + ctrl.invite = true; + } + } + + angular.module('webchat') + .component('loginCard', { + templateUrl: 'app/auth/loginCard.html', + controller: LoginCardController, + controllerAs: 'ctrl', + bindings: { + email: '<', + google: '<', + invite: '<', + onLogin: '&', + }, + }); +})(); diff --git a/webchat/auth/loginController.js b/webchat/auth/loginController.js index d708404ba..62f4a103f 100644 --- a/webchat/auth/loginController.js +++ b/webchat/auth/loginController.js @@ -6,6 +6,10 @@ webchat.controller('LoginController', function LoginController ($scope, $state) { const controller = this; + controller.success = () => { + console.log('Login done'); + } + const main = () => { console.log('LoginController running'); }; @@ -14,4 +18,4 @@ }); -})(); \ No newline at end of file +})(); diff --git a/webchat/ecis.css b/webchat/ecis.css new file mode 100644 index 000000000..8fd349696 --- /dev/null +++ b/webchat/ecis.css @@ -0,0 +1,10 @@ +ec-content { + display: grid; + align-items: center; + justify-items: center; + position: relative; + min-height: 100vh; + width: 100%; + margin: 0; + overflow: auto; +} diff --git a/webchat/home/home.html b/webchat/home/home.html index 987cac423..09fe625b0 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1 +1 @@ -

    HOME

    \ No newline at end of file +

    HOME

    diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 835647edf..2b45eef1c 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -8,10 +8,12 @@ const main = () => { console.log('HomeController running'); + console.log('Redirecting to login'); + $state.go('login') }; main(); }); -})(); \ No newline at end of file +})(); diff --git a/webchat/index.html b/webchat/index.html index 16f8692d2..e51d8a7f9 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -23,18 +23,20 @@ - + + +
    - + + From 467719bbf094d9d46b5a6f5bb2bd11edb04dbdce Mon Sep 17 00:00:00 2001 From: Pedro Espindula Date: Wed, 12 Dec 2018 11:28:23 -0300 Subject: [PATCH 021/237] Remove Call and Video states --- webchat/app.js | 20 -------------------- webchat/call/call.html | 0 webchat/call/callController.js | 17 ----------------- webchat/index.html | 2 -- webchat/video/video.html | 0 webchat/video/videoController.js | 17 ----------------- 6 files changed, 56 deletions(-) delete mode 100644 webchat/call/call.html delete mode 100644 webchat/call/callController.js delete mode 100644 webchat/video/video.html delete mode 100644 webchat/video/videoController.js diff --git a/webchat/app.js b/webchat/app.js index 4e7c5b621..bb4b54815 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -9,9 +9,7 @@ app.constant('STATES', { abstract: 'webchat', home: `${rootName}.home`, - call: `${rootName}.call`, chat: `${rootName}.chat`, - video: `${rootName}.video`, login: 'login', }); @@ -44,24 +42,6 @@ }, }, }) - .state(STATES.call, { - url: "/call", - views: { - content: { - templateUrl: "app/video/call.html", - controller: "CallController as controller", - }, - }, - }) - .state(STATES.video, { - url: "/video", - views: { - content: { - templateUrl: "app/video/video.html", - controller: "VideoController as controller", - }, - }, - }) .state(STATES.login, { url: "/login", views: { diff --git a/webchat/call/call.html b/webchat/call/call.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/webchat/call/callController.js b/webchat/call/callController.js deleted file mode 100644 index 5a745dc66..000000000 --- a/webchat/call/callController.js +++ /dev/null @@ -1,17 +0,0 @@ -(function () { - 'use strict'; - - const webchat = angular.module('webchat'); - - webchat.controller('CallController', function CallController ($scope, $state) { - const controller = this; - - const main = () => { - console.log('CallController running'); - }; - - main(); - - }); - -})(); \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index 16f8692d2..10f21a1b0 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -71,10 +71,8 @@ - - diff --git a/webchat/video/video.html b/webchat/video/video.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/webchat/video/videoController.js b/webchat/video/videoController.js deleted file mode 100644 index cdfd422f4..000000000 --- a/webchat/video/videoController.js +++ /dev/null @@ -1,17 +0,0 @@ -(function () { - 'use strict'; - - const webchat = angular.module('webchat'); - - webchat.controller('VideoController', function VideoController ($scope, $state) { - const controller = this; - - const main = () => { - console.log('VideoController running'); - }; - - main(); - - }); - -})(); \ No newline at end of file From f6875b369c2190e27e0022ca13df615fd3857f63 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 17 Dec 2018 11:38:43 -0300 Subject: [PATCH 022/237] Remove console.log statements --- webchat/auth/loginController.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/webchat/auth/loginController.js b/webchat/auth/loginController.js index 62f4a103f..91bad4ded 100644 --- a/webchat/auth/loginController.js +++ b/webchat/auth/loginController.js @@ -7,11 +7,9 @@ const controller = this; controller.success = () => { - console.log('Login done'); } const main = () => { - console.log('LoginController running'); }; main(); From f2d5a3b8584d765257ebdc1f9b9ffeea5050ffe8 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 17 Dec 2018 11:39:10 -0300 Subject: [PATCH 023/237] Use lodash.isUndefined and fix const declaration --- webchat/auth/loginCard.js | 8 ++++---- webchat/index.html | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webchat/auth/loginCard.js b/webchat/auth/loginCard.js index 4133fe15d..3300908e4 100644 --- a/webchat/auth/loginCard.js +++ b/webchat/auth/loginCard.js @@ -2,7 +2,7 @@ (function() { function LoginCardController() { - let ctrl = this; + const ctrl = this; ctrl.user = {}; ctrl.signIn = () => { @@ -11,11 +11,11 @@ } ctrl.$onInit = () => { - if (angular.isUndefined(ctrl.email) || ctrl.email === null) + if (_.isUndefined(ctrl.email) || ctrl.email === null) ctrl.email = true; - if (angular.isUndefined(ctrl.google) || ctrl.google === null) + if (_.isUndefined(ctrl.google) || ctrl.google === null) ctrl.google = true; - if (angular.isUndefined(ctrl.email) || ctrl.invite === null) + if (_.isUndefined(ctrl.email) || ctrl.invite === null) ctrl.invite = true; } } diff --git a/webchat/index.html b/webchat/index.html index e51d8a7f9..6db25b624 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -67,6 +67,7 @@ + From 6bd74c948442fc453c6b572758e9bec70f17123a Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 17 Dec 2018 11:40:04 -0300 Subject: [PATCH 024/237] Use css grid and remove commented code --- webchat/auth/login.css | 19 +++++--- webchat/auth/loginCard.html | 93 +++++++++++++++---------------------- 2 files changed, 51 insertions(+), 61 deletions(-) diff --git a/webchat/auth/login.css b/webchat/auth/login.css index 38537839a..671fdf4e3 100644 --- a/webchat/auth/login.css +++ b/webchat/auth/login.css @@ -1,10 +1,10 @@ img.ec-logo { - width: 80%; - margin: 1em; + width: 80%; + margin: 1em; } .limit-width { - max-width: 480px; + max-width: 480px; } .login-btn { @@ -40,15 +40,22 @@ img.ec-logo { } .login-form { + display: grid; + grid-template-areas: "email" "password" "submit"; + align-items: center; margin: 1em 0; } +.login-form-submit { + justify-self: right; +} + .login-card-footer { background-color: #E6E6E6; } @media screen and (max-width: 320px) { - img.ec-logo { - width: 60%; - } + img.ec-logo { + width: 60%; + } } diff --git a/webchat/auth/loginCard.html b/webchat/auth/loginCard.html index 0318e4277..189375e71 100644 --- a/webchat/auth/loginCard.html +++ b/webchat/auth/loginCard.html @@ -1,66 +1,49 @@ From 7cb3b466cd4cf53f904ac2ca7780f6153accaa7d Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 19 Dec 2018 11:52:42 -0300 Subject: [PATCH 025/237] Import authService and firebase for login --- webchat/app.js | 61 ++++++++++++++++++++++++++++++++++++++++++++-- webchat/index.html | 10 ++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index b337c66df..0b65f4d4b 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -3,7 +3,8 @@ const app = angular.module('webchat', [ 'ui.router', - 'ngMaterial' + 'ngMaterial', + 'firebase' ]); const rootName = 'webchat'; @@ -16,7 +17,8 @@ login: 'login', }); - app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider) => { + app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider, + $httpProvider) => { $mdIconProvider.fontSet('md', 'material-icons'); $mdThemingProvider.theme('docs-dark'); $mdThemingProvider.theme('input') @@ -81,9 +83,64 @@ }); $urlRouterProvider.otherwise("/"); + $httpProvider.interceptors.push('BearerAuthInterceptor'); }); + app.factory('BearerAuthInterceptor', function ($injector, $q, $state) { + return { + request: function(config) { + var AuthService = $injector.get('AuthService'); + config.headers = config.headers || {}; + if (AuthService.isLoggedIn()) { + return AuthService.getUserToken().then(token => { + config.headers.Authorization = 'Bearer ' + token; + + var API_URL = "/api/"; + var FIRST_POSITION = 0; + var requestToApi = config.url.indexOf(API_URL) == FIRST_POSITION; + + if (!_.isEmpty(AuthService.getCurrentUser().institutions) && requestToApi) { + config.headers['Institution-Authorization'] = AuthService.getCurrentUser().current_institution.key; + } + + Utils.updateBackendUrl(config); + return config || $q.when(config); + }); + } + + Utils.updateBackendUrl(config); + return config || $q.when(config); + }, + response: function(response) { + var app_version = response.headers("app_version"); + var AuthService = $injector.get('AuthService'); + AuthService.setAppVersion(app_version); + return response || $q.when(response); + }, + responseError: function(rejection) { + var AuthService = $injector.get('AuthService'); + if (rejection.status === 401) { + if (AuthService.isLoggedIn()) { + AuthService.logout(); + rejection.data.msg = "Sua sessão expirou!"; + } else { + $state.go("signin"); + } + } else if(rejection.status === 403) { + rejection.data.msg = "Você não tem permissão para realizar esta operação!"; + } else { + $state.go("error", { + "msg": rejection.data.msg || "Desculpa! Ocorreu um erro.", + "status": rejection.status + }); + } + return $q.reject(rejection); + } + }; + }); + + const main = () => { console.log("app running"); }; diff --git a/webchat/index.html b/webchat/index.html index 6db25b624..02cdd812e 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -68,6 +68,7 @@ + @@ -81,5 +82,14 @@ + + + + + + + + + From 565b4474d38620e82016cc628b8bb937ee293cb9 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 19 Dec 2018 11:53:25 -0300 Subject: [PATCH 026/237] Update css usage on login form --- webchat/auth/login.css | 32 +++++++++++++++++++------------- webchat/auth/loginCard.html | 4 ++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/webchat/auth/login.css b/webchat/auth/login.css index 671fdf4e3..cf9b1cd01 100644 --- a/webchat/auth/login.css +++ b/webchat/auth/login.css @@ -1,6 +1,6 @@ img.ec-logo { width: 80%; - margin: 1em; + margin: 0.8em; } .limit-width { @@ -8,7 +8,7 @@ img.ec-logo { } .login-btn { - margin: 0 0 1em auto; + margin: 0; width: 100%; } @@ -24,17 +24,6 @@ img.ec-logo { margin-left: 0.3em; } -#login-google-icon { - margin-left: 0.5em; -} - -#login-google-icon svg { - height: auto; - width: 1.3em; - line-height: auto; - margin: 0.155em 0.2em; -} - .login-text { text-align: justify; } @@ -46,10 +35,20 @@ img.ec-logo { margin: 1em 0; } +.form { + margin: 0.4em; +} + .login-form-submit { justify-self: right; } +.login-card { + display: grid; + max-height: 80vmax; + padding: 0; +} + .login-card-footer { background-color: #E6E6E6; } @@ -59,3 +58,10 @@ img.ec-logo { width: 60%; } } + +@media screen and (orientation: landscape) { + + .limit-width { + width: 360px; + } +} diff --git a/webchat/auth/loginCard.html b/webchat/auth/loginCard.html index 189375e71..f8b33e290 100644 --- a/webchat/auth/loginCard.html +++ b/webchat/auth/loginCard.html @@ -4,12 +4,12 @@ From e27c20d230ce1ac09030cb0aba85333e4891f665 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:07:12 -0300 Subject: [PATCH 097/237] Remove nonexistent state from app.js --- webchat/app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index ae679f4f9..cc51f7a30 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -110,10 +110,7 @@ } else if(rejection.status === 403) { rejection.data.msg = "Você não tem permissão para realizar esta operação!"; } else { - $state.go("error", { - "msg": rejection.data.msg || "Desculpa! Ocorreu um erro.", - "status": rejection.status - }); + $state.go(STATES.home); } return $q.reject(rejection); } From 1215653a2c4d0b3ac3582536af5ab09792a2c6d8 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:19:01 -0300 Subject: [PATCH 098/237] Use inline array annotation --- webchat/auth/authService.js | 6 +++--- webchat/auth/loginCard.js | 2 +- webchat/auth/loginController.js | 5 +++-- webchat/utils/httpService.js | 4 ++-- webchat/utils/messageService.js | 4 ++-- webchat/utils/user.js | 4 ++-- webchat/utils/userService.js | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index cae94ea7d..c129644e5 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -3,8 +3,8 @@ const app = angular.module("webchat"); - app.service("AuthService", function AuthService($q, $state, $window, UserService, MessageService, - User, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'User', 'STATES', + function AuthService($q, $state, $window, UserService, MessageService, User, STATES) { const service = this; const authObj = firebase.auth(); @@ -199,5 +199,5 @@ } init(); - }); + }]); })(); diff --git a/webchat/auth/loginCard.js b/webchat/auth/loginCard.js index f5738bab8..8c15a8dd4 100644 --- a/webchat/auth/loginCard.js +++ b/webchat/auth/loginCard.js @@ -41,7 +41,7 @@ angular.module('webchat') .component('loginCard', { templateUrl: 'app/auth/loginCard.html', - controller: LoginCardController, + controller: ['AuthService', 'MessageService', LoginCardController], controllerAs: 'ctrl', bindings: { email: '<', diff --git a/webchat/auth/loginController.js b/webchat/auth/loginController.js index c5f613c20..9dc326f9b 100644 --- a/webchat/auth/loginController.js +++ b/webchat/auth/loginController.js @@ -3,7 +3,8 @@ const webchat = angular.module('webchat'); - webchat.controller('LoginController', function LoginController (AuthService, $state, STATES) { + webchat.controller('LoginController', ['AuthService', '$state', 'STATES', + function LoginController(AuthService, $state, STATES) { const controller = this; controller.success = () => { @@ -15,5 +16,5 @@ $state.go(STATES.home); } } - }); + }]); })(); diff --git a/webchat/utils/httpService.js b/webchat/utils/httpService.js index 0bc05d13d..22cb860cc 100644 --- a/webchat/utils/httpService.js +++ b/webchat/utils/httpService.js @@ -3,7 +3,7 @@ (function () { const app = angular.module('webchat'); - app.service('HttpService', function HttpService($http) { + app.service('HttpService', ['$http', function HttpService($http) { const service = this; const POST = 'POST'; @@ -39,5 +39,5 @@ data: data }).then(response => response.data); } - }); + }]); })(); diff --git a/webchat/utils/messageService.js b/webchat/utils/messageService.js index d9bfc533d..001b710e2 100644 --- a/webchat/utils/messageService.js +++ b/webchat/utils/messageService.js @@ -3,7 +3,7 @@ (function() { const app = angular.module("webchat"); - app.service("MessageService", function MessageService($mdToast, $mdDialog) { + app.service("MessageService", ['$mdToast', '$mdDialog', function MessageService($mdToast, $mdDialog) { const service = this; const msg = { @@ -61,5 +61,5 @@ clickOutsideToClose:true }); } - }); + }]); })(); diff --git a/webchat/utils/user.js b/webchat/utils/user.js index efdafa6d2..b9d0b4b07 100644 --- a/webchat/utils/user.js +++ b/webchat/utils/user.js @@ -2,7 +2,7 @@ (function () { const app = angular.module('webchat'); - app.factory('User', () => { + app.factory('User', [() => { function User(data) { data = data || {}; _.extend(this, data); @@ -71,5 +71,5 @@ } return User; - }) + }]) })(); diff --git a/webchat/utils/userService.js b/webchat/utils/userService.js index 3b55a5ce7..86e0f776a 100644 --- a/webchat/utils/userService.js +++ b/webchat/utils/userService.js @@ -3,7 +3,7 @@ (function() { const app = angular.module("webchat"); - app.service("UserService", function UserService(HttpService) { + app.service("UserService", ['HttpService', function UserService(HttpService) { const service = this; const USER_URI = "/api/user"; @@ -15,5 +15,5 @@ service.load = function load() { return HttpService.get(USER_URI); }; - }); + }]); })(); From cacc84f74b6a8afbe4939906d1732ee41beee2a1 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:31:35 -0300 Subject: [PATCH 099/237] Use inline array annotation --- webchat/auth/authService.js | 11 +++-------- webchat/utils/httpService.js | 4 ++-- webchat/utils/messageService.js | 4 ++-- webchat/utils/user.js | 4 ++-- webchat/utils/userService.js | 4 ++-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index 6e4d95675..71f26a31c 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -3,8 +3,8 @@ const app = angular.module("webchat"); - app.service("AuthService", function AuthService($q, $state, $window, UserService, MessageService, - User, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'User', 'STATES', + function AuthService($q, $state, $window, UserService, MessageService, User, STATES) { const service = this; const authObj = firebase.auth(); @@ -164,11 +164,6 @@ $window.localStorage.userInfo = JSON.stringify(userInfo); }; - service.resetPassword = function resetPassword(email) { - return authObj.sendPasswordResetEmail(email); - - }; - service.$onLogout = function $onLogout(callback) { onLogoutListeners.push(callback); }; @@ -202,5 +197,5 @@ } init(); - }); + }]); })(); diff --git a/webchat/utils/httpService.js b/webchat/utils/httpService.js index 0bc05d13d..22cb860cc 100644 --- a/webchat/utils/httpService.js +++ b/webchat/utils/httpService.js @@ -3,7 +3,7 @@ (function () { const app = angular.module('webchat'); - app.service('HttpService', function HttpService($http) { + app.service('HttpService', ['$http', function HttpService($http) { const service = this; const POST = 'POST'; @@ -39,5 +39,5 @@ data: data }).then(response => response.data); } - }); + }]); })(); diff --git a/webchat/utils/messageService.js b/webchat/utils/messageService.js index d9bfc533d..001b710e2 100644 --- a/webchat/utils/messageService.js +++ b/webchat/utils/messageService.js @@ -3,7 +3,7 @@ (function() { const app = angular.module("webchat"); - app.service("MessageService", function MessageService($mdToast, $mdDialog) { + app.service("MessageService", ['$mdToast', '$mdDialog', function MessageService($mdToast, $mdDialog) { const service = this; const msg = { @@ -61,5 +61,5 @@ clickOutsideToClose:true }); } - }); + }]); })(); diff --git a/webchat/utils/user.js b/webchat/utils/user.js index efdafa6d2..b9d0b4b07 100644 --- a/webchat/utils/user.js +++ b/webchat/utils/user.js @@ -2,7 +2,7 @@ (function () { const app = angular.module('webchat'); - app.factory('User', () => { + app.factory('User', [() => { function User(data) { data = data || {}; _.extend(this, data); @@ -71,5 +71,5 @@ } return User; - }) + }]) })(); diff --git a/webchat/utils/userService.js b/webchat/utils/userService.js index 3b55a5ce7..86e0f776a 100644 --- a/webchat/utils/userService.js +++ b/webchat/utils/userService.js @@ -3,7 +3,7 @@ (function() { const app = angular.module("webchat"); - app.service("UserService", function UserService(HttpService) { + app.service("UserService", ['HttpService', function UserService(HttpService) { const service = this; const USER_URI = "/api/user"; @@ -15,5 +15,5 @@ service.load = function load() { return HttpService.get(USER_URI); }; - }); + }]); })(); From 35fa213d3b2842795fdf7dd0e7b398fa39472abf Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:32:25 -0300 Subject: [PATCH 100/237] Change nonexistent state to STATES.home on app.js --- webchat/app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index ae679f4f9..cc51f7a30 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -110,10 +110,7 @@ } else if(rejection.status === 403) { rejection.data.msg = "Você não tem permissão para realizar esta operação!"; } else { - $state.go("error", { - "msg": rejection.data.msg || "Desculpa! Ocorreu um erro.", - "status": rejection.status - }); + $state.go(STATES.home); } return $q.reject(rejection); } From 1d3bc0b25d24d07fb1c3a258e67f9c500ca66f1a Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:52:36 -0300 Subject: [PATCH 101/237] Use let/const, inline array annotation on app.js --- webchat/app.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index cc51f7a30..a9498f8c0 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -67,18 +67,19 @@ }); - app.factory('BearerAuthInterceptor', function (STATES, $injector, $q, $state) { + app.factory('BearerAuthInterceptor', ['STATES', '$injector', '$q', '$state', + function (STATES, $injector, $q, $state) { return { request: function(config) { - var AuthService = $injector.get('AuthService'); + const AuthService = $injector.get('AuthService'); config.headers = config.headers || {}; if (AuthService.isLoggedIn()) { return AuthService.getUserToken().then(token => { config.headers.Authorization = 'Bearer ' + token; - var API_URL = "/api/"; - var FIRST_POSITION = 0; - var requestToApi = config.url.indexOf(API_URL) == FIRST_POSITION; + const API_URL = "/api/"; + const FIRST_POSITION = 0; + const requestToApi = config.url.indexOf(API_URL) == FIRST_POSITION; if (!_.isEmpty(AuthService.getCurrentUser().institutions) && requestToApi) { config.headers['Institution-Authorization'] = AuthService.getCurrentUser().current_institution.key; @@ -93,13 +94,13 @@ return config || $q.when(config); }, response: function(response) { - var app_version = response.headers("app_version"); - var AuthService = $injector.get('AuthService'); + const app_version = response.headers("app_version"); + const AuthService = $injector.get('AuthService'); AuthService.setAppVersion(app_version); return response || $q.when(response); }, responseError: function(rejection) { - var AuthService = $injector.get('AuthService'); + const AuthService = $injector.get('AuthService'); if (rejection.status === 401) { if (AuthService.isLoggedIn()) { AuthService.logout(); @@ -115,7 +116,7 @@ return $q.reject(rejection); } }; - }); + }]); app.run(function authInterceptor(STATES, AuthService, $transitions, $state) { const ignored_routes = [ From 661aec6910cf115675edd53526c2f2fe65c3bd58 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 09:59:44 -0300 Subject: [PATCH 102/237] Update index.html to import authService and deps --- webchat/index.html | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/webchat/index.html b/webchat/index.html index 10f21a1b0..fe273409b 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -23,18 +23,18 @@ - +
    - + + @@ -74,5 +76,13 @@ + + + + + + + + From 57f86ebe1b4fecf59c70f0ee350f2431b644a0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 10:44:58 -0300 Subject: [PATCH 103/237] Fix typo on header inline array dependency injection --- webchat/components/header/ecis-header.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/header/ecis-header.component.js b/webchat/components/header/ecis-header.component.js index 1507ca242..e29386463 100644 --- a/webchat/components/header/ecis-header.component.js +++ b/webchat/components/header/ecis-header.component.js @@ -4,7 +4,7 @@ angular.module('webchat').component('ecisHeader', { templateUrl: "app/components/header/ecis-header.html", controller: [ - $mdSidenav, + '$mdSidenav', headerController, ], controllerAs: "headerCtrl", From c0b6ee0cacbabe1d7934ebfe613aa3644e2f1295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:04:31 -0300 Subject: [PATCH 104/237] Add WebchatService --- webchat/home/homeController.js | 7 +++-- webchat/index.html | 3 +++ webchat/services/WebchatService.js | 39 ++++++++++++++++++++++++++++ webchat/webchat/webchatController.js | 11 +++----- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 webchat/services/WebchatService.js diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 6243e6760..07545e209 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,9 +3,12 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', function HomeController () { + webchat.controller('HomeController', ['WebchatService', function HomeController (WebchatService) { const homeCtrl = this; - }); + homeCtrl.user = WebchatService.getCurrentUser(); + homeCtrl.contacts = WebchatService.getContacts(); + + }]); })(); \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index 1ee9da09d..7872b77e0 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -77,10 +77,13 @@ + + + diff --git a/webchat/services/WebchatService.js b/webchat/services/WebchatService.js new file mode 100644 index 000000000..b5a7caa3d --- /dev/null +++ b/webchat/services/WebchatService.js @@ -0,0 +1,39 @@ +(function () { + 'use strict'; + + angular.module("webchat").service('WebchatService',function WebchatService() { + const WebchatService = this; + + WebchatService.getContacts = () => [ + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"}, + ]; + + WebchatService.getCurrentUser = () => ( + {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"} + ); + + }); +})(); \ No newline at end of file diff --git a/webchat/webchat/webchatController.js b/webchat/webchat/webchatController.js index a1fd3c816..885d3720b 100644 --- a/webchat/webchat/webchatController.js +++ b/webchat/webchat/webchatController.js @@ -3,15 +3,10 @@ const webchat = angular.module('webchat'); - webchat.controller('WebchatController', function WebchatController () { + webchat.controller('WebchatController', ['WebchatService', function WebchatController (WebchatService) { const webchatCtrl = this; - webchatCtrl.user = { - name: "Name", - description: "Description", - avatar: "https://www.w3schools.com/howto/img_avatar.png", - }; - - }); + webchatCtrl.user = WebchatService.getCurrentUser(); + }]); })(); \ No newline at end of file From 8cc1bfedfe060e0af0c9dec32a1687ec186c1a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:05:14 -0300 Subject: [PATCH 105/237] Add utils.js --- webchat/index.html | 1 + webchat/utils/utils.js | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 webchat/utils/utils.js diff --git a/webchat/index.html b/webchat/index.html index 7872b77e0..73441b848 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -76,6 +76,7 @@ + diff --git a/webchat/utils/utils.js b/webchat/utils/utils.js new file mode 100644 index 000000000..d6322f40e --- /dev/null +++ b/webchat/utils/utils.js @@ -0,0 +1,55 @@ +"use strict"; + +const Utils = { + + /** + * Identify all the indexes where a substring occurs inside another string + * @param {string} substring to be searched + * @param {string} fullString that contains the searched substring + * @returns {[number]} a list of indexes where the substring occurs + */ + getIndexesOf : function getIndexesOf(substring, fullString) { + const indexes = []; + if (substring.length !== 0) { + let startIndex = 0, index; + while((index = fullString.indexOf(substring, startIndex)) > -1) { + indexes.push(index); + startIndex = index + substring.length; + } + } + return indexes; + }, + + /** + * Limit the specified string if its size is bigger than the specified limit + * @param {string} stringToLimit string that will be limited if necessary + * @param {number} limit max string size + * @returns {string} the sliced string, followed by ellipsis, or the original one + */ + limitString : function limitString(stringToLimit, limit) { + if(stringToLimit && stringToLimit.length > limit) { + const undefinedIndex = -1; + const endIndexesOfLast = this.getIndexesOf("    ", stringToLimit); + const indexOfLastAboveLimit = endIndexesOfLast.findIndex((index) => index >= limit); + if(indexOfLastAboveLimit !== undefinedIndex) { + const shiftToCloseTag = 4; + limit = endIndexesOfLast[indexOfLastAboveLimit] + shiftToCloseTag; + } + return stringToLimit.substring(0, limit+1) + "..."; + } else { + return stringToLimit; + } + }, + + /** + * This function indicate if the screen are in mobile device size. + * @returns {boolean} True if the screen is smaller or equal to 960 pixels and false in otherwise. + */ + isMobileScreen: function isMobileScreen(mobileScreenSize) { + if (mobileScreenSize) { + return screen.width <= mobileScreenSize; + } + + return screen.width <= 960; + }, +}; \ No newline at end of file From 096b11f66339bc93f61cfbb39a9294fecf5fdee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:07:46 -0300 Subject: [PATCH 106/237] Add char limitation to user description --- .../user-description/user-description.component.js | 5 +++++ webchat/components/user-description/user-description.html | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/webchat/components/user-description/user-description.component.js b/webchat/components/user-description/user-description.component.js index ca87cb18d..5c33c70e3 100644 --- a/webchat/components/user-description/user-description.component.js +++ b/webchat/components/user-description/user-description.component.js @@ -18,6 +18,11 @@ function userDescriptionController() { const userDescriptionCtrl = this; + + userDescriptionCtrl.charLimitName = Utils.isMobileScreen() ? 15 : 25; + userDescriptionCtrl.charLimitDescription = Utils.isMobileScreen() ? 20 : 35; + userDescriptionCtrl.limitString = (string, charLimit) => Utils.limitString(string, charLimit); + } })(); \ No newline at end of file diff --git a/webchat/components/user-description/user-description.html b/webchat/components/user-description/user-description.html index ac2061261..188f78a35 100644 --- a/webchat/components/user-description/user-description.html +++ b/webchat/components/user-description/user-description.html @@ -1,7 +1,7 @@
    - {{userDescriptionCtrl.name}} - {{userDescriptionCtrl.description}} + {{userDescriptionCtrl.limitString(userDescriptionCtrl.name, userDescriptionCtrl.charLimitName)}} + {{userDescriptionCtrl.limitString(userDescriptionCtrl.description, userDescriptionCtrl.charLimitDescription)}}
    \ No newline at end of file From dddcf5335467ce9ba8d14b91b5bb55b16d7e148b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:14:27 -0300 Subject: [PATCH 107/237] Fix content view size --- webchat/styles/custom.css | 4 ---- webchat/webchat/webchat.html | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index adcb28566..08befa124 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -3,10 +3,6 @@ display: flex; } -#content { - display: flex; -} - .hide-scrollbar::-webkit-scrollbar { display: none; } diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html index f19d55998..031be9b3a 100644 --- a/webchat/webchat/webchat.html +++ b/webchat/webchat/webchat.html @@ -1,2 +1,2 @@ -
    \ No newline at end of file +
    \ No newline at end of file From dd6181f2d6f4434d73fc9c138222aab50d061896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:15:50 -0300 Subject: [PATCH 108/237] Add expansive search bar component --- .../expansive-search-bar.component.js | 25 +++++++++++++++++++ .../expansive-search-bar.css | 14 +++++++++++ .../expansive-search-bar.html | 4 +++ webchat/index.html | 2 ++ 4 files changed, 45 insertions(+) create mode 100644 webchat/components/expansive-search-bar/expansive-search-bar.component.js create mode 100644 webchat/components/expansive-search-bar/expansive-search-bar.css create mode 100644 webchat/components/expansive-search-bar/expansive-search-bar.html diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.component.js b/webchat/components/expansive-search-bar/expansive-search-bar.component.js new file mode 100644 index 000000000..71b03e8d7 --- /dev/null +++ b/webchat/components/expansive-search-bar/expansive-search-bar.component.js @@ -0,0 +1,25 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("expansiveSearchBar", { + templateUrl: "app/components/expansive-search-bar/expansive-search-bar.html", + controller: expansiveSearchBarController, + controllerAs: "expansiveSearchBarCtrl", + bindings: { + className: "@", + style: "@", + ariaLabel: "@", + searchQuery: "=" + }, + }); + + function expansiveSearchBarController() { + const expansiveSearchBarCtrl = this; + + expansiveSearchBarCtrl.isExpanded = false; + + expansiveSearchBarCtrl.toggleSearch = () => expansiveSearchBarCtrl.isExpanded = !expansiveSearchBarCtrl.isExpanded; + + } + +})(); \ No newline at end of file diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.css b/webchat/components/expansive-search-bar/expansive-search-bar.css new file mode 100644 index 000000000..1ed406721 --- /dev/null +++ b/webchat/components/expansive-search-bar/expansive-search-bar.css @@ -0,0 +1,14 @@ +.search-container { + display: flex; + flex-direction: row; + display: 100%; +} + +.expansive-search-input { + width: 100%; + border-radius: 50px; + padding: 0 20px; + background-color: #EEEEEE; + border: none; + outline: none; +} \ No newline at end of file diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.html b/webchat/components/expansive-search-bar/expansive-search-bar.html new file mode 100644 index 000000000..75b80046f --- /dev/null +++ b/webchat/components/expansive-search-bar/expansive-search-bar.html @@ -0,0 +1,4 @@ +
    + + +
    diff --git a/webchat/index.html b/webchat/index.html index 73441b848..4f5f6c17f 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -31,6 +31,7 @@ + @@ -89,5 +90,6 @@ + From ddf998c90509babd89289a6d4183865e9755825d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:22:48 -0300 Subject: [PATCH 109/237] Add contacts-list component --- webchat/components/contacts/contacts.css | 9 ++++++++ .../contacts/list/contacts-list.component.js | 22 +++++++++++++++++++ .../contacts/list/contacts-list.html | 4 ++++ webchat/index.html | 3 +++ 4 files changed, 38 insertions(+) create mode 100644 webchat/components/contacts/contacts.css create mode 100644 webchat/components/contacts/list/contacts-list.component.js create mode 100644 webchat/components/contacts/list/contacts-list.html diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css new file mode 100644 index 000000000..e0be23644 --- /dev/null +++ b/webchat/components/contacts/contacts.css @@ -0,0 +1,9 @@ +.contacts-list { + overflow-y: scroll; + flex: 1; +} + +.user-contact { + font-size: 1.5em; + line-height: 1em; +} \ No newline at end of file diff --git a/webchat/components/contacts/list/contacts-list.component.js b/webchat/components/contacts/list/contacts-list.component.js new file mode 100644 index 000000000..6401a10cb --- /dev/null +++ b/webchat/components/contacts/list/contacts-list.component.js @@ -0,0 +1,22 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("contactsList", { + templateUrl: "app/components/contacts/list/contacts-list.html", + controller: contactsListController, + controllerAs: "contactsListCtrl", + bindings: { + className: "@", + style: "@", + ariaLabel: "@", + searchQuery: "<", + contacts: "<" + }, + }); + + function contactsListController() { + const contactsListCtrl = this; + + } + +})(); \ No newline at end of file diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html new file mode 100644 index 000000000..efa26276b --- /dev/null +++ b/webchat/components/contacts/list/contacts-list.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index 4f5f6c17f..2a67e8f39 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -31,6 +31,7 @@ + @@ -90,6 +91,8 @@ + + From ebfd206efb2e09b96ba4c78eb00a7cfdf9b76f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:23:31 -0300 Subject: [PATCH 110/237] Add contacts-toolbar component --- webchat/components/contacts/contacts.css | 6 ++++- .../toolbar/contacts-toolbar.component.js | 25 +++++++++++++++++++ .../contacts/toolbar/contacts-toolbar.html | 2 ++ webchat/index.html | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 webchat/components/contacts/toolbar/contacts-toolbar.component.js create mode 100644 webchat/components/contacts/toolbar/contacts-toolbar.html diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css index e0be23644..d0df95d71 100644 --- a/webchat/components/contacts/contacts.css +++ b/webchat/components/contacts/contacts.css @@ -6,4 +6,8 @@ .user-contact { font-size: 1.5em; line-height: 1em; -} \ No newline at end of file +} + +.close-button { + margin-left: auto; +} diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.component.js b/webchat/components/contacts/toolbar/contacts-toolbar.component.js new file mode 100644 index 000000000..36b698321 --- /dev/null +++ b/webchat/components/contacts/toolbar/contacts-toolbar.component.js @@ -0,0 +1,25 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("contactsToolbar", { + templateUrl: "app/components/contacts/toolbar/contacts-toolbar.html", + controller: contactsToolbarController, + controllerAs: "contactsToolbarCtrl", + bindings: { + className: "@", + style: "@", + ariaLabel: "@", + searchQuery: "=" + }, + }); + + function contactsToolbarController($mdSidenav) { + const contactsToolbarCtrl = this; + + contactsToolbarCtrl.toggleNavbar = (componentId) => { + $mdSidenav(componentId).toggle(); + }; + + } + +})(); \ No newline at end of file diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.html b/webchat/components/contacts/toolbar/contacts-toolbar.html new file mode 100644 index 000000000..de2f69010 --- /dev/null +++ b/webchat/components/contacts/toolbar/contacts-toolbar.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index 2a67e8f39..070fbd065 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -93,6 +93,7 @@ + From 3d93e0928f69c5cb30331cfea7024d7dd04ad243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:25:04 -0300 Subject: [PATCH 111/237] Add contacts-sidenav component --- .../sidenav/contacts-sidenav.component.js | 22 +++++++++++++++++++ .../contacts/sidenav/contacts-sidenav.html | 9 ++++++++ webchat/index.html | 1 + 3 files changed, 32 insertions(+) create mode 100644 webchat/components/contacts/sidenav/contacts-sidenav.component.js create mode 100644 webchat/components/contacts/sidenav/contacts-sidenav.html diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.component.js b/webchat/components/contacts/sidenav/contacts-sidenav.component.js new file mode 100644 index 000000000..692279e4d --- /dev/null +++ b/webchat/components/contacts/sidenav/contacts-sidenav.component.js @@ -0,0 +1,22 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("contactsSidenav", { + templateUrl: "app/components/contacts/sidenav/contacts-sidenav.html", + controller: contactsSidenavController, + controllerAs: "contactsSidenavCtrl", + bindings: { + className: "@", + style: "@", + ariaLabel: "@", + contacts: "<", + }, + }); + + function contactsSidenavController() { + const contactsSidenavCtrl = this; + contactsSidenavCtrl.searchQuery = ""; + + } + +})(); \ No newline at end of file diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.html b/webchat/components/contacts/sidenav/contacts-sidenav.html new file mode 100644 index 000000000..715970b72 --- /dev/null +++ b/webchat/components/contacts/sidenav/contacts-sidenav.html @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index 070fbd065..066e0165b 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -94,6 +94,7 @@ + From 68174db8805989d329574f6442b28607b9043a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 11:25:57 -0300 Subject: [PATCH 112/237] Add contacts sidenav to view --- webchat/components/header/ecis-header.component.js | 3 +++ webchat/components/header/ecis-header.html | 2 +- webchat/home/home.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webchat/components/header/ecis-header.component.js b/webchat/components/header/ecis-header.component.js index e29386463..73a21057f 100644 --- a/webchat/components/header/ecis-header.component.js +++ b/webchat/components/header/ecis-header.component.js @@ -20,5 +20,8 @@ function headerController ($mdSidenav) { const headerCtrl = this; + headerCtrl.toggleNavbar = (componentId) => { + $mdSidenav(componentId).toggle(); + }; } })(); diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index 5dc8af2b5..647bfbd5a 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -1,5 +1,5 @@
    - + diff --git a/webchat/home/home.html b/webchat/home/home.html index 987cac423..dc026e10a 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1 +1 @@ -

    HOME

    \ No newline at end of file + \ No newline at end of file From 047f6b81e1dc91caeb58fe05e52d9859157654ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 13:04:40 -0300 Subject: [PATCH 113/237] Add alphabetical order by name and then by description in contacts-list --- webchat/components/contacts/list/contacts-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index efa26276b..9e3410061 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,4 +1,4 @@ - + \ No newline at end of file From 692a24f33bd790e59e01e18f339fb0ce8016570e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 15 Jan 2019 13:34:37 -0300 Subject: [PATCH 114/237] Move inline style to custom.css --- webchat/styles/custom.css | 5 +++++ webchat/webchat/webchat.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index 08befa124..f497be6c6 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -3,6 +3,11 @@ display: flex; } +#content { + display: flex; + height: 100%; +} + .hide-scrollbar::-webkit-scrollbar { display: none; } diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html index 031be9b3a..f19d55998 100644 --- a/webchat/webchat/webchat.html +++ b/webchat/webchat/webchat.html @@ -1,2 +1,2 @@ -
    \ No newline at end of file +
    \ No newline at end of file From f1d10ebd2c80c6f476a95fd80add7ffc180ef379 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 14:44:29 -0300 Subject: [PATCH 115/237] Add error state * Add serviceWorker * Add $locationProvider to remove hash on url --- webchat/app.js | 46 +++++++++++++++++++++++++++--- webchat/ecis.css | 48 ++++++++++++++++++++++++++++++++ webchat/error/error.css | 25 +++++++++++++++++ webchat/error/error.html | 23 +++++++++++++++ webchat/error/errorController.js | 21 ++++++++++++++ webchat/index.html | 6 +++- webchat/sw.js | 20 +++++++++++++ 7 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 webchat/ecis.css create mode 100644 webchat/error/error.css create mode 100644 webchat/error/error.html create mode 100644 webchat/error/errorController.js create mode 100644 webchat/sw.js diff --git a/webchat/app.js b/webchat/app.js index a9498f8c0..acb5f50b7 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -13,10 +13,11 @@ home: `${rootName}.home`, chat: `${rootName}.chat`, login: 'login', + error: 'error', }); app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider, - $httpProvider) => { + $httpProvider, $locationProvider) => { $mdIconProvider.fontSet('md', 'material-icons'); $mdThemingProvider.theme('docs-dark'); $mdThemingProvider.theme('input') @@ -59,12 +60,38 @@ templateUrl: "app/auth/login.html", controller: "LoginController as controller", }, + } + }) + .state(STATES.error, { + url: '/error', + views: { + main: { + templateUrl: 'app/error/error.html', + controller: 'ErrorController as errorCtrl', + }, }, - }); - $urlRouterProvider.otherwise("/"); - $httpProvider.interceptors.push('BearerAuthInterceptor'); + params: { + 'msg': 'Desculpe! Ocorreu um erro.', + 'status': '500' + }, + }) + + $urlRouterProvider.otherwise(($injector, $location) => { + const state = $injector.get('$state'); + state.go(STATES.error, { + // msg: `Página não encontrada! "${$location.$location.$$absUrl}"`, + msg: `Página não encontrada! "${$location.path()}"`, + status: '404' + }) + + return; + }); + + $httpProvider.interceptors.push('BearerAuthInterceptor'); + $locationProvider.html5Mode(true); + $locationProvider.hashPrefix(''); }); app.factory('BearerAuthInterceptor', ['STATES', '$injector', '$q', '$state', @@ -121,6 +148,7 @@ app.run(function authInterceptor(STATES, AuthService, $transitions, $state) { const ignored_routes = [ STATES.login, + STATES.error, ]; $transitions.onStart({ @@ -131,4 +159,14 @@ $state.go(STATES.login); }); }); + + function initServiceWorker() { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.register('app/sw.js'); + } + } + + (function() { + initServiceWorker(); + })(); })(); diff --git a/webchat/ecis.css b/webchat/ecis.css new file mode 100644 index 000000000..10fb2e018 --- /dev/null +++ b/webchat/ecis.css @@ -0,0 +1,48 @@ +body, html { + height: 100%; + width: 100%; +} + +#webchat { + height: 100%; +} + +ec-content { + display: grid; + align-items: center; + justify-items: center; + position: relative; + height: 100%; + width: 100%; + margin: 0; + overflow: auto; +} + +.ec-card { + display: grid; + max-width: 480px; + margin: 0.6em; + box-shadow: 0 1px 3px 0 rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 2px 1px -1px rgba(0,0,0,.12); + background-color: white; + color: black; + border-radius: 2px; + overflow: hidden; +} + +.ec-card > card-header { + background-color: #009688; + color: white; + display: grid; +} + +.ec-card > card-header > h1 { + font-size: 1.2em; + margin: 0.6em; +} + +.ec-card > card-content { + display: grid; + margin: 0.4em; + padding: 0.6em; + justify-items: center; +} diff --git a/webchat/error/error.css b/webchat/error/error.css new file mode 100644 index 000000000..a78a74bd9 --- /dev/null +++ b/webchat/error/error.css @@ -0,0 +1,25 @@ +error-page-background { + width: 100%; + height: calc(32% + 2.2em); + position: absolute; + align-self: start; +} + +error-card { + align-self: center; + justify-self: center; + z-index: 10; +} + +error-buttons { + display: grid; + grid-template-columns: 1fr 1fr; + justify-items: end; + margin-left: auto; +} + +error-card > card-content > p { + justify-self: start; + text-align: justify; + word-break: break-all; +} diff --git a/webchat/error/error.html b/webchat/error/error.html new file mode 100644 index 000000000..c023b3064 --- /dev/null +++ b/webchat/error/error.html @@ -0,0 +1,23 @@ + + + + + + +

    ERRO {{errorCtrl.status}}

    +     + +

    Ocorreu um erro ao acessar esta informação.

    +

    {{ errorCtrl.msg }}

    + + + + Voltar + + + Reportar erro + + +     +     diff --git a/webchat/error/errorController.js b/webchat/error/errorController.js new file mode 100644 index 000000000..9ede5b42b --- /dev/null +++ b/webchat/error/errorController.js @@ -0,0 +1,21 @@ +'use strict'; + +(function() { + const app = angular.module('webchat'); + + app.controller('ErrorController', ['$state', '$stateParams', '$window', 'STATES', + function ErrorController($state, $stateParams, $window, STATES) { + const errorCtrl = this; + + errorCtrl.msg = $stateParams.msg; + errorCtrl.status = $stateParams.status; + + errorCtrl.goToHome = function goToHome() { + $state.go(STATES.home); + }; + + errorCtrl.goToReport = function goToReport() { + $window.open('http://support.plataformacis.org/report'); + } + }]); +})(); diff --git a/webchat/index.html b/webchat/index.html index fe273409b..5c6e4d9c6 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -24,11 +24,13 @@ + + -
    +
    + + diff --git a/webchat/sw.js b/webchat/sw.js new file mode 100644 index 000000000..b21277ea2 --- /dev/null +++ b/webchat/sw.js @@ -0,0 +1,20 @@ +(function () { + self.addEventListener('fetch', (event) => { + console.log(event); + if (event.request.url === 'http://localhost:8082/api/events?page=0&limit=15') { + event.respondWith( + fetch(event.request).then((response) => { + console.log("response event", response); + const errorConfig = { + status: 404, + statusText: "statusText", + }; + const errorData = { + msg: "erro mock" + }; + return new Response(JSON.stringify(errorData), errorConfig); + }) + ); + }; + }); +})(); From ce7ee153af1bd8184c4537c8e697b122aa974236 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 14:48:59 -0300 Subject: [PATCH 116/237] Add error state on BearerAuthInterceptor --- webchat/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webchat/app.js b/webchat/app.js index acb5f50b7..a71bf3b3d 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -138,7 +138,10 @@ } else if(rejection.status === 403) { rejection.data.msg = "Você não tem permissão para realizar esta operação!"; } else { - $state.go(STATES.home); + $state.go(STATES.error, { + msg: rejection.data.msg || "Desculpa! Ocorreu um erro.", + status: rejection.status + }); } return $q.reject(rejection); } From 170dc37dcc34ee358f38d3116ad813e4ac24facf Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 14:55:49 -0300 Subject: [PATCH 117/237] Remove comment --- webchat/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webchat/app.js b/webchat/app.js index a71bf3b3d..db360f42d 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -81,7 +81,6 @@ const state = $injector.get('$state'); state.go(STATES.error, { - // msg: `Página não encontrada! "${$location.$location.$$absUrl}"`, msg: `Página não encontrada! "${$location.path()}"`, status: '404' }) From 6bea2d3432cb168a145d04c5a6dd4848c3195bdc Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 15:11:01 -0300 Subject: [PATCH 118/237] Remove hashPrefix on app.js --- webchat/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webchat/app.js b/webchat/app.js index db360f42d..b52aba92c 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -90,7 +90,6 @@ $httpProvider.interceptors.push('BearerAuthInterceptor'); $locationProvider.html5Mode(true); - $locationProvider.hashPrefix(''); }); app.factory('BearerAuthInterceptor', ['STATES', '$injector', '$q', '$state', From 44c9a9bcb88090c1497b09157a76ef021e395d8d Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 15:56:18 -0300 Subject: [PATCH 119/237] Remove commented code on error.html --- webchat/error/error.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/webchat/error/error.html b/webchat/error/error.html index c023b3064..4f20bf9a4 100644 --- a/webchat/error/error.html +++ b/webchat/error/error.html @@ -9,8 +9,6 @@

    ERRO {{errorCtrl.status}}

    Ocorreu um erro ao acessar esta informação.

    {{ errorCtrl.msg }}

    - Voltar From 0cc41a9060dacc0ea1d54386421d75808452d637 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 15:59:23 -0300 Subject: [PATCH 120/237] Add Utils.getApiPath --- webchat/utils/utils.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/webchat/utils/utils.js b/webchat/utils/utils.js index 44d9b1753..fe9ab4101 100644 --- a/webchat/utils/utils.js +++ b/webchat/utils/utils.js @@ -12,4 +12,17 @@ const Utils = { config.url = config.url.replace(restApiRegex, restApiUrl + '/api/$1'); }, + + /** + * Extract an api path from url + * @param {string} url that contains the api request + * @returns the path if it exists, or the url, otherwise + */ + getApiPath : function getApiPath(url) { + if (_.isNil(url) || _.isNil(url.split)) { + return url; + } + + return '/' + url.split('/').splice(3).join('/'); + }, }; From 714195f5fd2f94215b6ac7ab5950bd901cf739e9 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 16:00:20 -0300 Subject: [PATCH 121/237] Set response_status on backend 404 error --- backend/handlers/erro_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/handlers/erro_handler.py b/backend/handlers/erro_handler.py index d77b34238..9e8dbbace 100644 --- a/backend/handlers/erro_handler.py +++ b/backend/handlers/erro_handler.py @@ -19,3 +19,4 @@ def get(self): "msg": "Not found", "status": 404 })) + self.response.set_status(404) From 8ef47da919d90f24df05fdba2a0586166056d5da Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 16:04:54 -0300 Subject: [PATCH 122/237] Add 404 redirect on backend error * Remove sw.js --- webchat/app.js | 15 +++++---------- webchat/index.html | 1 - webchat/sw.js | 20 -------------------- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 webchat/sw.js diff --git a/webchat/app.js b/webchat/app.js index b52aba92c..38ffae8e9 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -135,6 +135,11 @@ } } else if(rejection.status === 403) { rejection.data.msg = "Você não tem permissão para realizar esta operação!"; + } else if(rejection.status === 404) { + $state.go(STATES.error, { + msg: `URL não encontrada! "${Utils.getApiPath(rejection.config.url)}"`, + status: '404' + }); } else { $state.go(STATES.error, { msg: rejection.data.msg || "Desculpa! Ocorreu um erro.", @@ -160,14 +165,4 @@ $state.go(STATES.login); }); }); - - function initServiceWorker() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('app/sw.js'); - } - } - - (function() { - initServiceWorker(); - })(); })(); diff --git a/webchat/index.html b/webchat/index.html index 5c6e4d9c6..cce7e4797 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -73,7 +73,6 @@ - diff --git a/webchat/sw.js b/webchat/sw.js deleted file mode 100644 index b21277ea2..000000000 --- a/webchat/sw.js +++ /dev/null @@ -1,20 +0,0 @@ -(function () { - self.addEventListener('fetch', (event) => { - console.log(event); - if (event.request.url === 'http://localhost:8082/api/events?page=0&limit=15') { - event.respondWith( - fetch(event.request).then((response) => { - console.log("response event", response); - const errorConfig = { - status: 404, - statusText: "statusText", - }; - const errorData = { - msg: "erro mock" - }; - return new Response(JSON.stringify(errorData), errorConfig); - }) - ); - }; - }); -})(); From 5a77e904337a7c6dd0ef7aedb4b5e8ccc40f261f Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 16:11:15 -0300 Subject: [PATCH 123/237] Change goToReport to use Config.SUPPORT_URL --- webchat/error/errorController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/error/errorController.js b/webchat/error/errorController.js index 9ede5b42b..5bd1d4f7a 100644 --- a/webchat/error/errorController.js +++ b/webchat/error/errorController.js @@ -15,7 +15,7 @@ }; errorCtrl.goToReport = function goToReport() { - $window.open('http://support.plataformacis.org/report'); + $window.open(`${Config.SUPPORT_URL}/report`); } }]); })(); From 9d44eb067b132297366f898a91e5b29de0f2a69f Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 15 Jan 2019 16:46:35 -0300 Subject: [PATCH 124/237] Add errorController.test --- .../test/specs/error/errorController.test.js | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 webchat/test/specs/error/errorController.test.js diff --git a/webchat/test/specs/error/errorController.test.js b/webchat/test/specs/error/errorController.test.js new file mode 100644 index 000000000..71868be6e --- /dev/null +++ b/webchat/test/specs/error/errorController.test.js @@ -0,0 +1,40 @@ +'use strict'; + +(describe('Test errorController', () => { + let error, ctrl, state, states, params; + + error = { + status: 418, + msg: 'Test error' + } + + params = error; + + beforeEach(module('webchat')); + + beforeEach(inject(($controller, $state, STATES) => { + state = $state; + states = STATES; + + ctrl = $controller('ErrorController', { + $stateParams: params + }) + })); + + it('"Voltar" button should send back to STATES.home', () => { + spyOn(state, 'go').and.callThrough(); + ctrl.goToHome(); + expect(state.go).toHaveBeenCalledWith(states.home); + }) + + it('"Reportar erro" should send to CONFIG.SUPPORT_URL/report', () => { + spyOn(window, 'open').and.callThrough(); + ctrl.goToReport(); + expect(window.open).toHaveBeenCalledWith(`${Config.SUPPORT_URL}/report`); + }) + + it('should have error status and error msg', () => { + expect(ctrl.msg).toEqual(error.msg); + expect(ctrl.status).toEqual(error.status); + }) +})); From 5a94de5072713aa3b4554d5109b49497ba5eb889 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 16 Jan 2019 10:46:29 -0300 Subject: [PATCH 125/237] Use new css rules and remove unused bindings --- webchat/auth/login.css | 21 +++------------ webchat/auth/login.html | 2 +- webchat/auth/loginCard.html | 54 ++++++++++++++----------------------- webchat/auth/loginCard.js | 9 ------- 4 files changed, 25 insertions(+), 61 deletions(-) diff --git a/webchat/auth/login.css b/webchat/auth/login.css index 7b4e1934e..fd7ebc9c6 100644 --- a/webchat/auth/login.css +++ b/webchat/auth/login.css @@ -1,13 +1,3 @@ -login-card { - display: grid; - max-width: 480px; - margin: 0.6em; - box-shadow: 0 1px 3px 0 rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 2px 1px -1px rgba(0,0,0,.12); - background-color: white; - color: black; - border-radius: 2px; -} - .smooth-if.ng-enter, .smooth-if.ng-leave { transition: 1s ease-in-out all; } @@ -39,17 +29,15 @@ md-progress-circular > svg > path { stroke: #009688; } -login-card-content { - display: grid; +card-content.login-card-content { padding: 0.6em; margin: 0 1em; - justify-items: center; } img#login-logo { justify-self: center; - width: 70%; - margin: 0.8em 0; + width: 70%; + margin: 0.8em 0; } login-email-form { @@ -118,8 +106,7 @@ login-card-footer { width: 50%; } - login-card-content { - display: grid; + card-content.login-card-content { margin: 0; padding: 0; } diff --git a/webchat/auth/login.html b/webchat/auth/login.html index 646002b3c..7ba07bf11 100644 --- a/webchat/auth/login.html +++ b/webchat/auth/login.html @@ -1,3 +1,3 @@ - + diff --git a/webchat/auth/loginCard.html b/webchat/auth/loginCard.html index 22dbc95e9..549ffd588 100644 --- a/webchat/auth/loginCard.html +++ b/webchat/auth/loginCard.html @@ -1,51 +1,37 @@ - - - + -     + + Esqueceu a senha? -
    + diff --git a/webchat/auth/loginCard.js b/webchat/auth/loginCard.js index 8c15a8dd4..68fc69fb5 100644 --- a/webchat/auth/loginCard.js +++ b/webchat/auth/loginCard.js @@ -27,12 +27,6 @@ } ctrl.$onInit = () => { - if (_.isNil(ctrl.email)) - ctrl.email = true; - if (_.isNil(ctrl.google)) - ctrl.google = true; - if (_.isNil(ctrl.invite)) - ctrl.invite = true; if (_.isNil(ctrl.onLogin)) ctrl.onLogin = () => {}; } @@ -44,9 +38,6 @@ controller: ['AuthService', 'MessageService', LoginCardController], controllerAs: 'ctrl', bindings: { - email: '<', - google: '<', - invite: '<', onLogin: '&', }, }); From da2727559b8de1abe6504e7c88745af060fbce25 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 16 Jan 2019 11:03:17 -0300 Subject: [PATCH 126/237] Fix loginCard tests and add resetPassword test --- webchat/test/specs/auth/loginCard.test.js | 53 +++++++++++++---------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/webchat/test/specs/auth/loginCard.test.js b/webchat/test/specs/auth/loginCard.test.js index 8149e08c9..336d57f33 100644 --- a/webchat/test/specs/auth/loginCard.test.js +++ b/webchat/test/specs/auth/loginCard.test.js @@ -1,7 +1,9 @@ 'use strict'; (describe('Test LoginCardController', () => { - let scope, authService, ctrl, q, user; + let scope, authService, ctrl, q; + + const user = { name: 'User', active: 'true' }; beforeEach(module('webchat')); @@ -10,35 +12,42 @@ q = $q; scope = $rootScope.$new(); ctrl = $componentController('loginCard', { $scope: scope }); - user = { name: 'User', active: 'true' }; - authService.logout(); ctrl.$onInit(); - spyOn(authService, 'loginWithEmailAndPassword').and.callFake(() => { - return q.when(AuthService.login(user)); - }); - spyOn(authService, 'loginWithGoogle').and.callFake(() => { - return q.when(AuthService.login(user)); - }); - spyOn(ctrl, 'signIn').and.callThrough(); + spyOn(ctrl, 'onLogin'); expect(authService.isLoggedIn()).toBe(false); })) - it('should log in and call onLogin after logging in with email and password', () => { - ctrl.signIn(); - scope.$digest(); - expect(authService.loginWithEmailAndPassword).toHaveBeenCalled(); + it('should take to main frontend page on "Esqueci minha senha"', () => { + spyOn(window, 'open').and.callThrough(); + ctrl.resetPassword(); + expect(window.open).toHaveBeenCalledWith(Config.FRONTEND_URL); }) - it('should log in and call onLogin after logging in with google', () => { - ctrl.loginWithGoogle(); - scope.$digest(); - expect(authService.loginWithGoogle).toHaveBeenCalled(); - }) + describe('login functions', () => { + it('should log in and call onLogin after logging in with email and password', () => { + spyOn(authService, 'loginWithEmailAndPassword').and.callFake(() => { + return q.when(authService.login(user)); + }); + spyOn(ctrl, 'signIn').and.callThrough(); + ctrl.signIn(); + scope.$digest(); + expect(authService.loginWithEmailAndPassword).toHaveBeenCalled(); + }) + + it('should log in and call onLogin after logging in with google', () => { + spyOn(authService, 'loginWithGoogle').and.callFake(() => { + return q.when(authService.login(user)); + }); + ctrl.loginWithGoogle(); + scope.$digest(); + expect(authService.loginWithGoogle).toHaveBeenCalled(); + }) - afterEach(() => { - expect(authService.isLoggedIn()).toBe(true); - expect(ctrl.onLogin).toHaveBeenCalledWith(); + afterEach(() => { + expect(authService.isLoggedIn()).toBe(true); + expect(ctrl.onLogin).toHaveBeenCalledWith(); + }) }) })); From 89e8b0f589b6da540730a56ca42f4e8793afea18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 13:32:16 -0300 Subject: [PATCH 127/237] Adds NavbarManagementService --- .../contacts/toolbar/contacts-toolbar.component.js | 11 +++++++---- .../contacts/toolbar/contacts-toolbar.html | 2 +- webchat/components/header/ecis-header.component.js | 8 ++++---- webchat/components/header/ecis-header.html | 2 +- webchat/index.html | 1 + webchat/services/NavbarManagementService.js | 12 ++++++++++++ 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 webchat/services/NavbarManagementService.js diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.component.js b/webchat/components/contacts/toolbar/contacts-toolbar.component.js index 36b698321..13f08a557 100644 --- a/webchat/components/contacts/toolbar/contacts-toolbar.component.js +++ b/webchat/components/contacts/toolbar/contacts-toolbar.component.js @@ -3,7 +3,10 @@ angular.module("webchat").component("contactsToolbar", { templateUrl: "app/components/contacts/toolbar/contacts-toolbar.html", - controller: contactsToolbarController, + controller: [ + 'NavbarManagementService', + contactsToolbarController, + ], controllerAs: "contactsToolbarCtrl", bindings: { className: "@", @@ -13,11 +16,11 @@ }, }); - function contactsToolbarController($mdSidenav) { + function contactsToolbarController(NavbarManagementService) { const contactsToolbarCtrl = this; - contactsToolbarCtrl.toggleNavbar = (componentId) => { - $mdSidenav(componentId).toggle(); + contactsToolbarCtrl.toggleNavbar = () => { + NavbarManagementService.toggleSidenav('left'); }; } diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.html b/webchat/components/contacts/toolbar/contacts-toolbar.html index de2f69010..f89d720a3 100644 --- a/webchat/components/contacts/toolbar/contacts-toolbar.html +++ b/webchat/components/contacts/toolbar/contacts-toolbar.html @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/webchat/components/header/ecis-header.component.js b/webchat/components/header/ecis-header.component.js index 73a21057f..332d5b513 100644 --- a/webchat/components/header/ecis-header.component.js +++ b/webchat/components/header/ecis-header.component.js @@ -4,7 +4,7 @@ angular.module('webchat').component('ecisHeader', { templateUrl: "app/components/header/ecis-header.html", controller: [ - '$mdSidenav', + 'NavbarManagementService', headerController, ], controllerAs: "headerCtrl", @@ -17,11 +17,11 @@ }, }); - function headerController ($mdSidenav) { + function headerController (NavbarManagementService) { const headerCtrl = this; - headerCtrl.toggleNavbar = (componentId) => { - $mdSidenav(componentId).toggle(); + headerCtrl.toggleNavbar = () => { + NavbarManagementService.toggleSidenav('left'); }; } })(); diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index 647bfbd5a..9cfe60a06 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -1,5 +1,5 @@
    - + diff --git a/webchat/index.html b/webchat/index.html index 066e0165b..c0ff3f274 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -81,6 +81,7 @@ + diff --git a/webchat/services/NavbarManagementService.js b/webchat/services/NavbarManagementService.js new file mode 100644 index 000000000..b3fc897cf --- /dev/null +++ b/webchat/services/NavbarManagementService.js @@ -0,0 +1,12 @@ +(function () { + 'use strict'; + + angular.module("webchat").service('NavbarManagementService', ['$mdSidenav', function NavbarManagementService($mdSidenav) { + const NavbarManagementService = this; + + this.toggleSidenav = (sidenavId) => { + $mdSidenav(sidenavId).toggle(); + }; + + }]); +})(); \ No newline at end of file From ce389945366fdea328bb55edb1f362a650cc92e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 13:40:24 -0300 Subject: [PATCH 128/237] Fix contacts list scroll on navbar --- webchat/components/contacts/contacts.css | 1 + webchat/components/contacts/list/contacts-list.html | 10 ++++++---- .../components/contacts/sidenav/contacts-sidenav.html | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css index d0df95d71..ed7ad3830 100644 --- a/webchat/components/contacts/contacts.css +++ b/webchat/components/contacts/contacts.css @@ -1,6 +1,7 @@ .contacts-list { overflow-y: scroll; flex: 1; + height: 100%; } .user-contact { diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 9e3410061..1da8dc287 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,4 +1,6 @@ - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.html b/webchat/components/contacts/sidenav/contacts-sidenav.html index 715970b72..6959b75f5 100644 --- a/webchat/components/contacts/sidenav/contacts-sidenav.html +++ b/webchat/components/contacts/sidenav/contacts-sidenav.html @@ -5,5 +5,5 @@ md-whiteframe="4" style="height: 100%; width: 100%;"> - + \ No newline at end of file From 5431e9171aa7880430ac3227ba2e37366ebe078d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 13:59:10 -0300 Subject: [PATCH 129/237] Fix another bug related to contacts-list scroll on mobile --- webchat/components/contacts/contacts.css | 7 +++++-- webchat/components/contacts/list/contacts-list.html | 2 +- webchat/components/contacts/sidenav/contacts-sidenav.html | 4 ++-- webchat/styles/custom.css | 4 ++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css index ed7ad3830..4b1f99c03 100644 --- a/webchat/components/contacts/contacts.css +++ b/webchat/components/contacts/contacts.css @@ -1,7 +1,10 @@ .contacts-list { - overflow-y: scroll; + overflow: hidden; flex: 1; - height: 100%; +} + +.contacts-list-container { + overflow-y: scroll; } .user-contact { diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 1da8dc287..dff35d86d 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,4 +1,4 @@ - + diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.html b/webchat/components/contacts/sidenav/contacts-sidenav.html index 6959b75f5..88d02a1af 100644 --- a/webchat/components/contacts/sidenav/contacts-sidenav.html +++ b/webchat/components/contacts/sidenav/contacts-sidenav.html @@ -3,7 +3,7 @@ md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" md-whiteframe="4" - style="height: 100%; width: 100%;"> + style="height: 100%; width: 100%; display: flex"> - + \ No newline at end of file diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index f497be6c6..d3faf3b91 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -37,4 +37,8 @@ .no-margin { margin: 0; +} + +.fill-height { + height: 100%; } \ No newline at end of file From df2349390737dbd8ddfd50f574c04937056a2e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 14:21:02 -0300 Subject: [PATCH 130/237] Add simple-fade-in and simple-fade-out animations --- .../expansive-search-bar.css | 10 ++++++++++ .../expansive-search-bar.html | 2 +- webchat/styles/custom.css | 20 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.css b/webchat/components/expansive-search-bar/expansive-search-bar.css index 1ed406721..f8df9d914 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.css +++ b/webchat/components/expansive-search-bar/expansive-search-bar.css @@ -11,4 +11,14 @@ background-color: #EEEEEE; border: none; outline: none; +} + +.expansive-search-input.ng-enter { + animation-name: simple-fade-in; + animation-duration: 0.25s; +} + +.expansive-search-input.ng-leave { + animation-name: simple-fade-out; + animation-duration: 0.25s; } \ No newline at end of file diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.html b/webchat/components/expansive-search-bar/expansive-search-bar.html index 75b80046f..41ce38462 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.html +++ b/webchat/components/expansive-search-bar/expansive-search-bar.html @@ -1,4 +1,4 @@
    - +
    diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index d3faf3b91..87c72ecb8 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -1,6 +1,8 @@ #webchat { height: 100vh; display: flex; + animation-name: simple-fade-in; + animation-duration: 2s; } #content { @@ -41,4 +43,22 @@ .fill-height { height: 100%; +} + +@keyframes simple-fade-in { + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } +} + +@keyframes simple-fade-out { + 0% { + opacity: 1; + } + 100% { + opacity: 0; + } } \ No newline at end of file From c858347d9cf4eef668dd17df53b6d35707e42160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 14:50:05 -0300 Subject: [PATCH 131/237] Changes close button position and icon to improve ux --- webchat/components/contacts/contacts.css | 6 +++++- webchat/components/contacts/toolbar/contacts-toolbar.html | 4 ++-- .../expansive-search-bar/expansive-search-bar.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css index 4b1f99c03..aa8969e73 100644 --- a/webchat/components/contacts/contacts.css +++ b/webchat/components/contacts/contacts.css @@ -13,5 +13,9 @@ } .close-button { - margin-left: auto; + margin-right: auto; } + +.contacts-search { + margin-left: auto; +} \ No newline at end of file diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.html b/webchat/components/contacts/toolbar/contacts-toolbar.html index f89d720a3..d903788c5 100644 --- a/webchat/components/contacts/toolbar/contacts-toolbar.html +++ b/webchat/components/contacts/toolbar/contacts-toolbar.html @@ -1,2 +1,2 @@ - - \ No newline at end of file + + diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.html b/webchat/components/expansive-search-bar/expansive-search-bar.html index 41ce38462..3c845cbb1 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.html +++ b/webchat/components/expansive-search-bar/expansive-search-bar.html @@ -1,4 +1,4 @@
    - +
    From 6ef21a50df3056349d1f31642a6ff4b7317d1213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 15:23:59 -0300 Subject: [PATCH 132/237] Fix non filling screen navbar on opening page --- webchat/styles/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index 87c72ecb8..805eadc8f 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -1,5 +1,5 @@ #webchat { - height: 100vh; + min-height: 100vh; display: flex; animation-name: simple-fade-in; animation-duration: 2s; From d061184400571182cbb61901a48e77ff657338a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 15:27:20 -0300 Subject: [PATCH 133/237] Fix overflow showing on content --- webchat/styles/custom.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index 805eadc8f..3f15e4615 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -1,5 +1,10 @@ +html { + overflow: hidden +} + #webchat { min-height: 100vh; + overflow: hidden; display: flex; animation-name: simple-fade-in; animation-duration: 2s; @@ -8,6 +13,7 @@ #content { display: flex; height: 100%; + overflow: hidden; } .hide-scrollbar::-webkit-scrollbar { From 1a5639c0cc1d8ae1e8fcdafc24d115e117fabc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 16 Jan 2019 16:09:49 -0300 Subject: [PATCH 134/237] Fix hidding chrome navigation bar hiding when scrolling on mobile --- webchat/styles/custom.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index 3f15e4615..d73b5aaf5 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -1,9 +1,9 @@ -html { - overflow: hidden +html, body { + height: 100%; + max-height: 100%; } #webchat { - min-height: 100vh; overflow: hidden; display: flex; animation-name: simple-fade-in; @@ -11,6 +11,9 @@ html { } #content { + flex: 1; + min-height: 100%; + max-height: 100%; display: flex; height: 100%; overflow: hidden; From c1b29865298c45fdd76b2f4935a3d67212158f9a Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 16 Jan 2019 16:49:09 -0300 Subject: [PATCH 135/237] Add basic chat and chatClient --- webchat/utils/chat.js | 92 +++++++++++++++++++++++ webchat/utils/chatClient.js | 146 ++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+) create mode 100644 webchat/utils/chat.js create mode 100644 webchat/utils/chatClient.js diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js new file mode 100644 index 000000000..191db8258 --- /dev/null +++ b/webchat/utils/chat.js @@ -0,0 +1,92 @@ +'use strict'; +(function () { + const app = angular.module('webchat'); + + app.factory('Chat', [() => { + function Chat() { + this.rpc = new RTCPeerConnection([ + { url: 'stun:stun.l.google.com:19302' } + ]); + this.eventHandlers = {}; + this.pendingCandidates = []; + this.tempRemote = {}; + } + + Chat.prototype.emit = function(eventName, e) { + if (this.eventHandlers[eventName]) { + this.eventHandlers[eventName].forEach((f) => { + f(e); + }); + } + } + + Chat.prototype.on = function(eventName, f) { + if (!this.eventHandlers[eventName]) { + this.eventHandlers[eventName] = []; + } + this.eventHandlers[eventName].push(f); + } + + Chat.prototype.receiveCandidate = function(candidate) { + if (this.rpc.remoteDescription == null) { + this.pendingCandidates.push(candidate); + return; + } + const rtcCandidate = new RTCIceCandidate(candidate); + + this.rpc.addIceCandidate(rtcCandidate); + } + + Chat.prototype.handleDataChannel = function(e) { + const chat = this; + e.channel.onmessage = channelEv => chat.emit('msg-received', channelEv); + } + + Chat.prototype.init = function(stream) { + stream.getTracks().forEach(t => this.rpc.addTrack(t, stream)); + // this.rpc.addTrack(stream.getTracks()[1], stream); + this.sendChannel = this.rpc.createDataChannel('sendChannel'); + this.rpc.ondatachannel = this.handleDataChannel.bind(this); + this.rpc.ontrack = this.handleTrack.bind(this); + this.rpc.onicecandidate = e => this.emit('ice-candidate', e); + } + + Chat.prototype.offer = function() { + this.rpc.createOffer().then(offer => { + this.rpc.setLocalDescription(offer).then(() => { + return offer; + }) + }); + } + + Chat.prototype.setTempRemote = function(remote) { + this.tempRemote = remote; + } + + Chat.prototype.setRemote = function(remote) { + this.rpc.setRemoteDescription(remote); + } + + Chat.prototype.accept = function() { + this.rpc.createAnswer().then(answer => { + this.rpc.setLocalDescription(answer).then(() => { + if (this.pendingCandidates > 0) { + this.pendingCandidates.forEach(c => this.receiveCandidate(c)); + } + return answer; + }) + }); + } + + Chat.prototype.handleTrack = function(e) { + this.emit('track-received', e); + } + + Chat.prototype.sendMessage = function(message) { + this.sendChannel.send(message); + this.emit('msg-sent', message); + } + + return Chat; + }]) +})(); diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js new file mode 100644 index 000000000..a4dd6faa6 --- /dev/null +++ b/webchat/utils/chatClient.js @@ -0,0 +1,146 @@ +'use strict'; +(function () { + const app = angular.module('webchat'); + + app.factory('ChatClient', [(Chat, UserService) => { + const hostname = 'localhost'; + const port = 8090; + + function ChatClient(id) { + this.id = id; + this.ws = new WebSocket(`ws://${hostname}:${port}`); + // maps event name to function + this.eventHandlers = {}; + // maps id to remote descriptions + this.remotes = {}; + // maps id to Chat + this.chats = {}; + // + this.users = {}; + + this.ws.onopen = () => { + const user = { + type: 'signin', + name: this.id, + }; + this.ws.send(JSON.stringify(user)); + this.requestUsers(); + }; + // we have to explictly pass a function with the event argument + // otherwise "this" will refer to the websocket instead of the Client object + // i.e.: this.ws.onmessage = handleWebSocket + // /\_____ this inside here will be the websocket + // we could also bind (this) back + // this.ws.onmessage = this.handleWebSocket(this); <-- also works + this.ws.onmessage = e => this.handleWebSocket(e); + } + + ChatClient.prototype.createChat = function(id) { + const chat = new Chat(); + this.chats[id] = chat; + this.emit('chat-created', { id, chat }); + return chat; + } + + ChatClient.prototype.handleWebSocket = function(e) { + const data = JSON.parse(e.data); + if (data.type === 'offer') { + const chat = this.createChat(data.name); + chat.setTempRemote(data); + this.emit('offer-received', data.name); + } else if (data.type === 'answer') { + this.handleAnswer(data); + } else if (data.candidate) { + this.addIceCandidate(data); + } else if (data.type === 'userList') { + this.handleUserListUpdate(data.users); + } else { + this.emit('ws-message', e); + } + } + + ChatClient.prototype.emit = function(eventName, e) { + if (this.eventHandlers[eventName]) { + this.eventHandlers[eventName].forEach((f) => { + f(e); + }); + } + } + + ChatClient.prototype.on = function(eventName, f) { + if (!this.eventHandlers[eventName]) { + this.eventHandlers[eventName] = []; + } + this.eventHandlers[eventName].push(f); + } + + ChatClient.prototype.addIceCandidate = function(e) { + if (this.chats[e.name]) { + this.chats[e.name].receiveCandidate(e.candidate); + } + } + + ChatClient.prototype.acceptChat = function(id, stream) { + const chat = this.chats[id]; + chat.setRemote(chat.tempRemote); + chat.init(stream).then(() => { + chat.accept().then(connection => { + this.ws.send(JSON.stringify({ + type: connection.type, + sdp: connection.sdp, + name: this.id, + dest: id, + })) + chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(id, e)); + }); + }) + } + + ChatClient.prototype.handleDiscoveredIceCandidates = function(id, e) { + if (e.candidate) { + const msg = { + type: 'newCandidate', + name: this.id, + dest: id, + candidate: e.candidate, + }; + this.ws.send(JSON.stringify(msg)); + } + } + + ChatClient.prototype.handleAnswer = function(data) { + const chat = this.chats[data.name]; + chat.setRemote(data); + } + + ChatClient.prototype.call = function(dest, stream) { + const chat = this.createChat(dest); + chat.init(stream).then(() => { + chat.offer().then(connection => { + const requestObj = { + name: this.id, + dest, + type: connection.type, + sdp: connection.sdp, + }; + this.ws.send(JSON.stringify(requestObj)); + chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(dest, e)); + }); + }); + } + + ChatClient.prototype.requestUsers = function() { + this.ws.send(JSON.stringify({ + name: this.id, + type: 'requestUsers', + })); + } + + ChatClient.prototype.handleUserListUpdate = function(users) { + this.users = users; + this.emit('userListUpdate', users); + } + + return ChatClient; + }]) +})(); From 98a01d0f856e8e1385ad5b7524d326424145cc04 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 17 Jan 2019 10:46:13 -0300 Subject: [PATCH 136/237] Working calls --- webchat/auth/authService.js | 18 ++++++++-- webchat/home/home.html | 18 ++++++++++ webchat/home/homeController.js | 61 +++++++++++++++++++++++++++++++--- webchat/index.html | 4 +++ webchat/utils/chat.js | 23 +++++++------ webchat/utils/chatClient.js | 48 ++++++++++++-------------- 6 files changed, 128 insertions(+), 44 deletions(-) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index c129644e5..3acef1857 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -3,8 +3,8 @@ const app = angular.module("webchat"); - app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'User', 'STATES', - function AuthService($q, $state, $window, UserService, MessageService, User, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'User', 'STATES', 'ChatClient', + function AuthService($q, $state, $window, UserService, MessageService, User, STATES, ChatClient) { const service = this; const authObj = firebase.auth(); @@ -13,7 +13,7 @@ let resolveTokenPromise; let loadTokenPromise; let refreshInterval; - let isLoadingUser; + let chatClient; const provider = new firebase.auth.GoogleAuthProvider(); /** @@ -77,6 +77,12 @@ } }); + Object.defineProperty(service, 'chatClient', { + get: function() { + return chatClient; + } + }); + // It receives the app version and verify if it matches with // the actual frontend version, setting up the private variable // versionAvailable with true, if matches, or false, otherwise. @@ -123,6 +129,7 @@ if (user.emailVerified) { return user.getIdToken(true).then(function(idToken) { return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { + chatClient = new ChatClient(userInfo.key); return userInfo; }); }); @@ -175,6 +182,10 @@ return false; }; + service.getChatClient = () => { + return chatClient; + } + /** * Execute each function stored to be thriggered when user logout * is called. @@ -195,6 +206,7 @@ if ($window.localStorage.userInfo) { const parse = JSON.parse($window.localStorage.userInfo); userInfo = new User(parse); + chatClient = new ChatClient(userInfo.key); } } diff --git a/webchat/home/home.html b/webchat/home/home.html index 09fe625b0..bedaca286 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1 +1,19 @@

    HOME

    +
    + {{controller.userList}} +
    + + + + + diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 712a01eaf..ea586b36a 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,15 +3,68 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', function HomeController ($scope, $state) { + webchat.controller('HomeController', function HomeController (ChatClient, AuthService, UserService) { const controller = this; - const main = () => { + controller.userList = {}; + controller.users = AuthService.chatClient.users; + controller.client = {}; + controller.currentChat = {}; + controller.remoteClient = {}; + + controller.$onInit = () => { console.log('HomeController running'); + controller.client = AuthService.getChatClient(); + controller.remoteClient = new ChatClient('remote-me'); + controller.getUserList(); + controller.client.on('userListUpdate', controller.getUserList); + controller.remoteClient.on('offer-received', callPrompt); + controller.client.on('chat-created', e => { + e.chat.on('msg-received', ev => { + console.log(ev); + }) + + e.chat.on('track-received', ev => { + document.getElementById('video-remote').srcObject = ev.streams[0]; + }) + }) + controller.remoteClient.on('chat-created', e => { + e.chat.on('msg-received', ev => { + console.log(ev); + }) + }) }; - main(); + controller.updateUsers = () => { + controller.client.requestUsers(); + } - }); + controller.call = () => { + navigator.mediaDevices.getUserMedia({ video: {width: 640, height: 480} }).then(stream => { + controller.client.call('remote-me', stream); + // angular.element not working here + document.getElementById('video-selfie').srcObject = stream; + }); + } + controller.getUserList = () => { + let parsedList = {}; + controller.users.forEach(userKey => { + UserService.getUser(userKey).then((res) => { + parsedList[userKey] = res.name; + }); + }); + + controller.userList = parsedList; + } + + function callPrompt(id) { + const answer = confirm(`${id} has called. accept?`); + if (answer) { + navigator.mediaDevices.getUserMedia({ video: { width: 640, height: 480 } }).then(stream => { + controller.remoteClient.acceptCall(id, stream); + }); + } + } + }); })(); diff --git a/webchat/index.html b/webchat/index.html index 0d30084a1..301aefa1b 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -89,5 +89,9 @@ + + + + diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index 191db8258..d1c2a1f5f 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -44,7 +44,6 @@ Chat.prototype.init = function(stream) { stream.getTracks().forEach(t => this.rpc.addTrack(t, stream)); - // this.rpc.addTrack(stream.getTracks()[1], stream); this.sendChannel = this.rpc.createDataChannel('sendChannel'); this.rpc.ondatachannel = this.handleDataChannel.bind(this); this.rpc.ontrack = this.handleTrack.bind(this); @@ -52,8 +51,8 @@ } Chat.prototype.offer = function() { - this.rpc.createOffer().then(offer => { - this.rpc.setLocalDescription(offer).then(() => { + return this.rpc.createOffer().then(offer => { + return this.rpc.setLocalDescription(offer).then(() => { return offer; }) }); @@ -68,14 +67,16 @@ } Chat.prototype.accept = function() { - this.rpc.createAnswer().then(answer => { - this.rpc.setLocalDescription(answer).then(() => { - if (this.pendingCandidates > 0) { - this.pendingCandidates.forEach(c => this.receiveCandidate(c)); - } - return answer; - }) - }); + return this.rpc.setRemoteDescription(this.tempRemote).then(() => { + return this.rpc.createAnswer().then(answer => { + return this.rpc.setLocalDescription(answer).then(() => { + if (this.pendingCandidates > 0) { + this.pendingCandidates.forEach(c => this.receiveCandidate(c)); + } + return answer; + }) + }); + }) } Chat.prototype.handleTrack = function(e) { diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index a4dd6faa6..0d36c8ed6 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -2,7 +2,7 @@ (function () { const app = angular.module('webchat'); - app.factory('ChatClient', [(Chat, UserService) => { + app.factory('ChatClient', ['Chat', (Chat) => { const hostname = 'localhost'; const port = 8090; @@ -24,7 +24,6 @@ name: this.id, }; this.ws.send(JSON.stringify(user)); - this.requestUsers(); }; // we have to explictly pass a function with the event argument // otherwise "this" will refer to the websocket instead of the Client object @@ -80,20 +79,18 @@ } } - ChatClient.prototype.acceptChat = function(id, stream) { + ChatClient.prototype.acceptCall = function(id, stream) { const chat = this.chats[id]; - chat.setRemote(chat.tempRemote); - chat.init(stream).then(() => { - chat.accept().then(connection => { - this.ws.send(JSON.stringify({ - type: connection.type, - sdp: connection.sdp, - name: this.id, - dest: id, - })) - chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(id, e)); - }); - }) + chat.init(stream) + chat.accept().then(connection => { + this.ws.send(JSON.stringify({ + type: connection.type, + sdp: connection.sdp, + name: this.id, + dest: id, + })) + chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(id, e)); + }); } ChatClient.prototype.handleDiscoveredIceCandidates = function(id, e) { @@ -115,17 +112,16 @@ ChatClient.prototype.call = function(dest, stream) { const chat = this.createChat(dest); - chat.init(stream).then(() => { - chat.offer().then(connection => { - const requestObj = { - name: this.id, - dest, - type: connection.type, - sdp: connection.sdp, - }; - this.ws.send(JSON.stringify(requestObj)); - chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(dest, e)); - }); + chat.init(stream) + chat.offer().then(connection => { + const requestObj = { + name: this.id, + dest, + type: connection.type, + sdp: connection.sdp, + }; + this.ws.send(JSON.stringify(requestObj)); + chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(dest, e)); }); } From e5d26a97a535532326ad1998f9f9b9d0ce6658cf Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 17 Jan 2019 15:03:40 -0300 Subject: [PATCH 137/237] Pre push --- webchat/home/home.html | 5 +++- webchat/home/homeController.js | 43 +++++++++++++++++----------------- webchat/utils/chat.js | 29 ++++++++++++++++------- webchat/utils/chatClient.js | 43 +++++++++++++++++----------------- 4 files changed, 67 insertions(+), 53 deletions(-) diff --git a/webchat/home/home.html b/webchat/home/home.html index bedaca286..4eb4a454c 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -2,7 +2,10 @@

    HOME

    {{controller.userList}}
    - + +msg + +     +

    Não há contatos online no momento.

     \ No newline at end of file From 2b4b640a9e10331e8f6421afc0a15f7b05345902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 23 Jan 2019 13:50:47 -0300 Subject: [PATCH 149/237] Removes mocks and uses AuthService to get current user --- webchat/home/homeController.js | 1 - webchat/services/WebchatService.js | 15 +-------------- webchat/webchat/webchatController.js | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 07545e209..12c7cf36d 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -6,7 +6,6 @@ webchat.controller('HomeController', ['WebchatService', function HomeController (WebchatService) { const homeCtrl = this; - homeCtrl.user = WebchatService.getCurrentUser(); homeCtrl.contacts = WebchatService.getContacts(); }]); diff --git a/webchat/services/WebchatService.js b/webchat/services/WebchatService.js index a1c614e03..6977c4a15 100644 --- a/webchat/services/WebchatService.js +++ b/webchat/services/WebchatService.js @@ -4,20 +4,7 @@ angular.module("webchat").service('WebchatService', function WebchatService() { const WebchatService = this; - WebchatService.getCurrentUser = () => ( - {name: "Name", description: "Description", avatar: "https://www.w3schools.com/howto/img_avatar.png"} - ); - - WebchatService.getContacts = () => { - const contactsList = []; - const numContacts = 30; - - for (let i = 0; i < numContacts; i++) { - contactsList.push(WebchatService.getCurrentUser()); - } - - return contactsList; - }; + WebchatService.getContacts = () => []; }); diff --git a/webchat/webchat/webchatController.js b/webchat/webchat/webchatController.js index 885d3720b..338dcd989 100644 --- a/webchat/webchat/webchatController.js +++ b/webchat/webchat/webchatController.js @@ -3,10 +3,10 @@ const webchat = angular.module('webchat'); - webchat.controller('WebchatController', ['WebchatService', function WebchatController (WebchatService) { + webchat.controller('WebchatController', ['AuthService', function WebchatController (AuthService) { const webchatCtrl = this; - webchatCtrl.user = WebchatService.getCurrentUser(); + webchatCtrl.user = AuthService.getCurrentUser(); }]); })(); \ No newline at end of file From 37dc57fc17eba41dffdf0ec0d07650b2ccf13efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 23 Jan 2019 13:54:39 -0300 Subject: [PATCH 150/237] Fix non-filling screen visual bug --- webchat/styles/custom.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index d73b5aaf5..7b060f208 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -1,6 +1,7 @@ html, body { height: 100%; max-height: 100%; + overflow: hidden; } #webchat { @@ -8,6 +9,7 @@ html, body { display: flex; animation-name: simple-fade-in; animation-duration: 2s; + min-height: 100%; } #content { From 117494827fee7f1ebf402311f0431516ab3babb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 23 Jan 2019 15:32:42 -0300 Subject: [PATCH 151/237] Fix user description injections --- .../components/contacts/list/contacts-list.html | 2 +- webchat/components/header/ecis-header.html | 2 +- webchat/images/avatar.png | Bin 0 -> 78128 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 webchat/images/avatar.png diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 841c4a3e4..674f1f1ee 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,6 +1,6 @@ - +

    Não há contatos online no momento.

    diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index 9cfe60a06..36cd998f1 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -1,6 +1,6 @@
    - +
    \ No newline at end of file diff --git a/webchat/images/avatar.png b/webchat/images/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..6805897b8ea59665a9e87542c77fd90892f812c3 GIT binary patch literal 78128 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
    eHr^M0df7BS=VRvrQfhV&~ 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 literal 0 HcmV?d00001 From 0f2fc7bc28d4a2377c7bec6b16c45f99c9460931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 23 Jan 2019 15:37:47 -0300 Subject: [PATCH 152/237] Add logout function to header --- webchat/components/header/ecis-header.component.js | 7 ++++++- webchat/components/header/ecis-header.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/webchat/components/header/ecis-header.component.js b/webchat/components/header/ecis-header.component.js index dac382759..ba5766684 100644 --- a/webchat/components/header/ecis-header.component.js +++ b/webchat/components/header/ecis-header.component.js @@ -12,6 +12,7 @@ angular.module('webchat').component('ecisHeader', { templateUrl: "app/components/header/ecis-header.html", controller: [ + 'AuthService', 'NavbarManagementService', headerController, ], @@ -21,11 +22,15 @@ }, }); - function headerController (NavbarManagementService) { + function headerController (AuthService, NavbarManagementService) { const headerCtrl = this; headerCtrl.toggleNavbar = () => { NavbarManagementService.toggleSidenav('left'); }; + + headerCtrl.logout = () => { + AuthService.logout(); + }; } })(); diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index 36cd998f1..f155fc5d7 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -2,5 +2,5 @@ - +
    \ No newline at end of file From e54c5a5d15cf9792ceb969c3d835f3f02993ddba Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 24 Jan 2019 09:42:51 -0300 Subject: [PATCH 153/237] Add new call logic * Call requests are now exchanged before RPC offers are sent --- webchat/utils/chat.js | 20 +++++-------- webchat/utils/chatClient.js | 60 ++++++++++++++++++++++++++----------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index d82561263..48e84710f 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -10,7 +10,7 @@ this.rpc = new RTCPeerConnection([{ url: 'stun:stun.l.google.com:19302', url: 'stun:stun2.l.google.com:19302', - url: 'stun:stun3.l.google.com:19302' + url: 'stun:stun3.l.google.com:19302', }]); this.eventHandlers = {}; stream.getTracks().forEach(t => { @@ -20,9 +20,8 @@ this.sendChannel = this.rpc.createDataChannel('sendChannel'); this.rpc.ondatachannel = this.handleDataChannel.bind(this); this.rpc.ontrack = e => this.emit('track-received', e); - this.rpc.oniceconnectionstatechange = this.iceConnectionCB.bind(this); - this.rpc.onsignalingstatechange = this.stateCB.bind(this); - this.currentMessages; + this.rpc.oniceconnectionstatechange = this.iceConnectionCB; + this.rpc.onsignalingstatechange = this.stateCB; } Chat.prototype.emit = function(eventName, e) { @@ -43,7 +42,6 @@ Chat.prototype.receiveCandidate = function(candidate) { console.log('candidate received', candidate); const rtcCandidate = new RTCIceCandidate(candidate); - this.rpc.addIceCandidate(rtcCandidate); } @@ -58,12 +56,12 @@ }; } - Chat.prototype.iceConnectionCB = function() { - console.log(`Ice connection changed to ${this.rpc.iceConnectionState}`) + Chat.prototype.iceConnectionCB = function(ev) { + console.log('ice connection changed', ev.target.iceConnectionState) } - Chat.prototype.stateCB = function() { - console.log(`State connection changed to ${this.rpc.signalingState}`) + Chat.prototype.stateCB = function(ev) { + console.log('state changed', ev.target.signalingState); } Chat.prototype.offer = function() { @@ -78,10 +76,6 @@ }); } - Chat.prototype.setTempRemote = function(remote) { - this.tempRemote = remote; - } - Chat.prototype.setRemote = function(remote) { this.rpc.setRemoteDescription(remote); } diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index bccd114f4..58a57a958 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -11,12 +11,12 @@ this.ws = new WebSocket(`ws://${hostname}:${port}`); // maps event name to function this.eventHandlers = {}; - // maps id to remote descriptions - this.remotes = {}; // maps id to Chat this.chats = {}; // this.users = {}; + // + this.stream = undefined; this.ws.onopen = () => { const user = { @@ -43,9 +43,13 @@ ChatClient.prototype.handleWebSocket = function (e) { const data = JSON.parse(e.data); - if (data.type === 'offer') { - this.remotes[data.name] = data; - this.emit('offer-received', data.name); + console.log('ws event: ', data.type); + if (data.type === 'callRequest') { + this.emit('call-requested', data.name); + } else if (data.type === 'callAnswer') { + this.offerRpc(data.name); + } else if (data.type === 'offer') { + this.answerRpc(data); } else if (data.type === 'answer') { this.handleAnswer(data); } else if (data.candidate) { @@ -57,6 +61,10 @@ } } + ChatClient.prototype.handleAnswer = function(msg) { + this.chats[msg.name].setRemote(msg); + } + ChatClient.prototype.emit = function (eventName, e) { if (this.eventHandlers[eventName]) { this.eventHandlers[eventName].forEach((f) => { @@ -73,17 +81,17 @@ } ChatClient.prototype.addIceCandidate = function (e) { - console.log('ws candidate received', e); if (this.chats[e.name]) { this.chats[e.name].receiveCandidate(e.candidate); } } - ChatClient.prototype.acceptCall = function (id, stream) { - const remote = this.remotes[id]; - const chat = this.createChat(id, stream); + ChatClient.prototype.answerRpc = function (msg) { + const id = msg.name; + console.log('offer received, answering ', id); + const chat = this.chats[id]; chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(id, e)); - chat.accept(remote).then(connection => { + chat.accept(msg).then(connection => { this.ws.send(JSON.stringify({ type: connection.type, sdp: connection.sdp, @@ -106,13 +114,9 @@ } } - ChatClient.prototype.handleAnswer = function (data) { - const chat = this.chats[data.name]; - chat.setRemote(data); - } - - ChatClient.prototype.call = function (dest, stream) { - const chat = this.createChat(dest, stream); + ChatClient.prototype.offerRpc = function (dest) { + console.log('call accepted, offering', dest); + const chat = this.chats[dest]; chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(dest, e)); chat.offer().then(connection => { const requestObj = { @@ -137,6 +141,28 @@ this.emit('user-list-update', users); } + ChatClient.prototype.call = function (dest, stream) { + this.stream = this.stream || stream; + this.chats[dest] = this.createChat(dest, this.stream); + + this.ws.send(JSON.stringify({ + name: this.id, + dest: dest, + type: 'callRequest' + })) + } + + ChatClient.prototype.acceptCall = function (id, stream) { + this.stream = this.stream || stream; + this.createChat(id, this.stream); + + this.ws.send(JSON.stringify({ + name: this.id, + dest: id, + type: 'callAnswer' + })) + } + return ChatClient; }]) })(); From 0b338125914393ff06ab3e124c4c9799177eb868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 28 Jan 2019 08:50:53 -0300 Subject: [PATCH 154/237] Add Utils.getIndexesOf() test when there is no substring match --- webchat/test/specs/utils/utils.test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webchat/test/specs/utils/utils.test.js b/webchat/test/specs/utils/utils.test.js index 42d55e3b5..a184bc28c 100644 --- a/webchat/test/specs/utils/utils.test.js +++ b/webchat/test/specs/utils/utils.test.js @@ -10,6 +10,13 @@ const indexes = Utils.getIndexesOf(substring, string); expect(indexes).toEqual([5,17,25]); }); + + it('should return an empty array', () => { + const string = 'test substring other'; + const substring = 'X'; + const indexes = Utils.getIndexesOf(substring, string); + expect(indexes).toEqual([]); + }); }); describe('limitString()', function () { From b4091841c22e99c193f866f765499c78951e95e2 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 24 Jan 2019 09:56:41 -0300 Subject: [PATCH 155/237] Refactor chatClient to es6 class and add jsdoc --- webchat/app.js | 6 + webchat/utils/chat.js | 2 +- webchat/utils/chatClient.js | 436 ++++++++++++++++++++++++------------ 3 files changed, 305 insertions(+), 139 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 38ffae8e9..4e6dc7c6f 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -16,6 +16,12 @@ error: 'error', }); + app.constant('WEBSOCKET', { + hostname: window.location.hostname, + port: 8090, + maxRetries: 5, + }); + app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) => { $mdIconProvider.fontSet('md', 'material-icons'); diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index 48e84710f..76c386351 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -16,7 +16,7 @@ stream.getTracks().forEach(t => { this.rpc.addTrack(t, stream) }); - this.rpc.onicecandidate = e => this.emit('ice-candidate', e); + this.rpc.onicecandidate = e => this.emit('ice-candidate-discovered', e); this.sendChannel = this.rpc.createDataChannel('sendChannel'); this.rpc.ondatachannel = this.handleDataChannel.bind(this); this.rpc.ontrack = e => this.emit('track-received', e); diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index 58a57a958..d89329547 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -2,165 +2,325 @@ (function () { const app = angular.module('webchat'); - app.factory('ChatClient', ['Chat', (Chat) => { - const hostname = window.location.hostname; - const port = 8090; - - function ChatClient(id) { - this.id = id; - this.ws = new WebSocket(`ws://${hostname}:${port}`); - // maps event name to function - this.eventHandlers = {}; - // maps id to Chat - this.chats = {}; - // - this.users = {}; - // - this.stream = undefined; - - this.ws.onopen = () => { - const user = { - type: 'signin', - name: this.id, + app.factory('ChatClient', ['Chat', 'WEBSOCKET', (Chat, WEBSOCKET) => { + const ChatClient = class ChatClient { + /** + * Create a new ChatClient (WebRTC wrapper), + * and automatically start a WebSocket connection. + * The ChatClient also mediates connections by Chat objects + * before a RPC connection is succesfully completed. + * @param {string} id - firebase id of the user + */ + constructor(id) { + this.id = id; + this.ws = {}; + this.retries = 0; + this.eventHandlers = {}; + this.chats = {}; + this.users = {}; + this.stream = undefined; + this.startWebsocket(); + } + + /** + * Starts a new connection with the websocket server. + */ + startWebsocket() { + const websocket = `ws://${WEBSOCKET.hostname}:${WEBSOCKET.port}`; + this.ws = new WebSocket(websocket); + + // Sends a signin message to the websocket as soon as the websocket connects + this.ws.onopen = () => { + this.sendToWebsocket('signin', '', {}); + this.retries = 0; }; - this.ws.send(JSON.stringify(user)); - }; - // we have to explictly pass a function with the event argument - // otherwise "this" will refer to the websocket instead of the Client object - // i.e.: this.ws.onmessage = handleWebSocket - // /\_____ this inside here will be the websocket - // we could also bind (this) back - // this.ws.onmessage = this.handleWebSocket(this); <-- also works - this.ws.onmessage = e => this.handleWebSocket(e); - } - ChatClient.prototype.createChat = function (id, stream) { - const chat = new Chat(stream, this.id); - this.chats[id] = chat; - this.emit('chat-created', { id, chat }); - return chat; - } + // Listen to the websocket messages, treating those as "events" + this.ws.onmessage = e => this.handleWebSocket(e); - ChatClient.prototype.handleWebSocket = function (e) { - const data = JSON.parse(e.data); - console.log('ws event: ', data.type); - if (data.type === 'callRequest') { - this.emit('call-requested', data.name); - } else if (data.type === 'callAnswer') { - this.offerRpc(data.name); - } else if (data.type === 'offer') { - this.answerRpc(data); - } else if (data.type === 'answer') { - this.handleAnswer(data); - } else if (data.candidate) { - this.addIceCandidate(data); - } else if (data.type === 'userList') { - this.handleUserListUpdate(data.users); - } else { - this.emit('ws-message', e); + // Retry connection when closed or refused + this.ws.onclose = () => { + this.retryWebSocket(); + } } - } - ChatClient.prototype.handleAnswer = function(msg) { - this.chats[msg.name].setRemote(msg); - } + /** + * Retries a new connection with the websocket server, + * with a maximum number of WEBSOCKET.maxRetries (5); + */ + retryWebSocket() { + if (this.retries < WEBSOCKET.maxRetries) { + this.retries += 1; + console.log('Retrying connection, retry: ', this.retries); + setTimeout(function () { + this.startWebsocket() + }.bind(this), 5000) + } + } - ChatClient.prototype.emit = function (eventName, e) { - if (this.eventHandlers[eventName]) { - this.eventHandlers[eventName].forEach((f) => { - f(e); - }); + /** + * Mimics node's on/emit event handlers. + * Raises an event. + * @param {string} eventName - name of the event + * @param {object} e - event data + */ + emit(eventName, e) { + if (this.eventHandlers[eventName]) { + this.eventHandlers[eventName].forEach((f) => { + f(e); + }); + } } - } - ChatClient.prototype.on = function (eventName, f) { - if (!this.eventHandlers[eventName]) { - this.eventHandlers[eventName] = []; + /** + * Mimics node's on/emit event handlers. + * Adds a callback to an event. + * @param {string} eventName - name of the event + * @param {Function} f - function to be called when event is raised. + */ + on(eventName, f) { + if (!this.eventHandlers[eventName]) { + this.eventHandlers[eventName] = []; + } + this.eventHandlers[eventName].push(f); } - this.eventHandlers[eventName].push(f); - } - ChatClient.prototype.addIceCandidate = function (e) { - if (this.chats[e.name]) { - this.chats[e.name].receiveCandidate(e.candidate); + /** + * Sends a message (JSON string) to another user via the websocket + * @param {string} type - type of message + * @param {string} to - id of the user to send a message to + * @param {object} data - contents of the message + */ + sendToWebsocket(type, to, data) { + const msg = { type, from: this.id, to, data } + this.ws.send(JSON.stringify(msg)); } - } - ChatClient.prototype.answerRpc = function (msg) { - const id = msg.name; - console.log('offer received, answering ', id); - const chat = this.chats[id]; - chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(id, e)); - chat.accept(msg).then(connection => { - this.ws.send(JSON.stringify({ - type: connection.type, - sdp: connection.sdp, - name: this.id, - dest: id, - })) - }); - } + /** + * Create a new Chat object associated to an id of another user + * @param {string} id - firebase id of the other user + * @param {MediaStream} stream - a Video/Audio stream for the connection + * + * @returns {Chat} a chat object of this connection + * @fires ChatClient#chat-created + */ + createChat(id, stream) { + const chat = new Chat(stream, this.id); + this.chats[id] = chat; - ChatClient.prototype.handleDiscoveredIceCandidates = function (id, e) { - if (e.candidate) { - console.log('candidate discovered', e.candidate); - const msg = { - type: 'newCandidate', - name: this.id, - dest: id, - candidate: e.candidate, - }; - this.ws.send(JSON.stringify(msg)); + /** + * Event when a new chat is created. + * + * @event ChatClient#chat-created + * @property {string} id - id of the other user associated with this chat + * @property {Chat} chat - Chat object + */ + this.emit('chat-created', { id, chat }); + return chat; } - } - ChatClient.prototype.offerRpc = function (dest) { - console.log('call accepted, offering', dest); - const chat = this.chats[dest]; - chat.on('ice-candidate', e => this.handleDiscoveredIceCandidates(dest, e)); - chat.offer().then(connection => { - const requestObj = { - name: this.id, - dest, - type: connection.type, - sdp: connection.sdp, - }; - this.ws.send(JSON.stringify(requestObj)); - }); - } + /** + * Handles events sent by the websocket server, + * parsing the string content on {e.data} as a javascript regular object. + * @param {MessageEvent} e - websocket event + * + * @listens websocket#call-request + * @listens websocket#call-answer + * @listens websocket#rpc-offer + * @listens websocket#rpc-answer + * @listens websocket#ice-candidate-received + * @listens websocket#user-list-update + */ + handleWebSocket(event) { + const msg = JSON.parse(event.data); + console.log('ws event: ', msg.type); + console.log(msg); - ChatClient.prototype.requestUsers = function () { - this.ws.send(JSON.stringify({ - name: this.id, - type: 'requestUsers', - })); - } + switch (msg.type) { + case 'call-request': + this.handleCallRequest(msg); + break; + case 'call-answer': + this.handleCallAnswer(msg); + break; + case 'rpc-offer': + this.handleRpcOffer(msg); + break; + case 'rpc-answer': + this.handleRpcAnswer(msg); + break; + case 'ice-candidate-received': + this.handleCandidateReceived(msg); + break; + case 'user-list-update': + this.handleUserListUpdate(msg); + break; + default: + this.emit('ws-message', msg); + break; + } + } - ChatClient.prototype.handleUserListUpdate = function (users) { - this.users = users; - this.emit('user-list-update', users); - } + /** + * Handles a websocket call request message. + * @param {object} msg - websocket message + * @property {string} type - 'call-request' + * @property {string} id - id of the user who has requested the call. + * @property {object} data - {} + * + * @fires ChatClient#call-requested + */ + handleCallRequest(msg) { + /** + * Event when a call has been request by another user + * + * @event ChatClient#call-requested + * @property {string} id - id of the user who has request the call + */ + this.emit('call-requested', msg.id); + } + + /** + * Handles a websocket callAnswer event. + * Creates a new Chat object, + * and sends back a message to that user with RPC details. + * @param {object} msg - websocket message + * @property {string} type - 'call-answer' + * @property {string} id - id of the user who has accepted the call. + * @property {object} data - {} + * @listens Chat#ice-candidate-discovered + */ + handleCallAnswer(msg) { + const to = msg.id; + const chat = this.chats[to]; + chat.on('ice-candidate-discovered', candidate => this.handleDiscoveredIceCandidates(to, candidate)); + chat.offer().then(connection => { + this.sendToWebsocket('rpc-offer', to, connection); + }); + } - ChatClient.prototype.call = function (dest, stream) { - this.stream = this.stream || stream; - this.chats[dest] = this.createChat(dest, this.stream); + /** + * Event when a RPC offer has been received. + * + * @event websocket#rpc-offer + */ + /** + * Handles a websocket offer message. + * Gets the relevant Chat object, + * accepts that RPC connection, + * and sends a message back to the offerer. + * @param {object} msg - websocket message + * @property {string} type - 'rpc-offer' + * @property {string} id - id of the user who has offered + * @property {object} data - RPC object, with type='offer' and sdp + * @listens Chat#ice-candidate-discovered + */ + handleRpcOffer(msg) { + const id = msg.id; + console.log('offer received, answering ', id); + const chat = this.chats[id]; + chat.on('ice-candidate-discovered', e => this.handleDiscoveredIceCandidates(id, e)); + chat.accept(msg.data).then(connection => { + this.sendToWebsocket('rpc-answer', id, connection); + }); + } - this.ws.send(JSON.stringify({ - name: this.id, - dest: dest, - type: 'callRequest' - })) - } + /** + * Handles a RPC answer. + * Gets the related chat, + * and completes the connection. + * @param {object} msg - websocket message + * @property {String} type - 'rpc-answer' + * @property {string} id - id of the user who has answered + * @property {object} data - RPC object, with type='answer' and sdp + */ + handleRpcAnswer(msg) { + this.chats[msg.id].setRemote(msg.data); + } - ChatClient.prototype.acceptCall = function (id, stream) { - this.stream = this.stream || stream; - this.createChat(id, this.stream); + /** + * Event when a ICE candidate has been received. + * + * @event websocket#ice-candidate-received + */ + /** + * Handles ICE candidate messages from the websocket. + * Gets the associated chat, + * and adds the candidate to that RPC. + * @param {object} msg - websocket message. + * @property {String} type - newCandidate + * @property {string} id - id of the user who has sent the candidates + * @property {candidate} candidate - a ICE candidate to be added by the RPC connection + */ + handleCandidateReceived(msg) { + if (this.chats[msg.id]) { + this.chats[msg.id].receiveCandidate(msg.data); + } + } + + /** + * Event when the list of online users has been updated. + * + * @event websocket#userList + * @property {string} type - userList + * @property {[string]} users - list of users id currently online + */ + /** + * Handles a websocket userList message, + * propagating that data back as a ChatClient proper event. + * @param {object} data - event data + * @listens websocket#user-list-update + * @fires ChatClient#user-list-updated + */ + handleUserListUpdate(msg) { + this.users = msg.data; + /** + * @event ChatClient#user-list-updated + * @property {[string]} users - list of users id currently online + */ + this.emit('user-list-updated', this.users); + } + + /** + * Handles chat event from discovered ice candidates. + * @param {string} id - id of the user to be sent candidates + * @param {object} event - event containing the candidate info + */ + handleDiscoveredIceCandidates(id, event) { + if (event.candidate) { + console.log('candidate discovered', event.candidate); + this.sendToWebsocket('ice-candidate', id, event.candidate); + } + } - this.ws.send(JSON.stringify({ - name: this.id, - dest: id, - type: 'callAnswer' - })) + /** + * Calls another user. + * @param {string} id - id of the user to request a call + * @param {MediaStream} stream - MediaStream video/audio object of the caller + */ + requestCall(id, stream) { + this.stream = this.stream || stream; + this.chats[id] = this.createChat(id, this.stream); + this.sendToWebsocket('call-request', id, {}); + } + + /** + * Accepts a call from another user. + * @param {string} id - id of the user who has called. + * @param {MediaStream} stream - MediaStream video/audio object of the answerer + */ + acceptCall(id, stream) { + this.stream = this.stream || stream; + this.createChat(id, this.stream); + this.sendToWebsocket('call-answer', id, {}); + } + + /** + * Requests the websocket a list of online users. + */ + requestUsers() { + this.sendToWebsocket('user-list-request', '', {}); + } } return ChatClient; From aaa3bfab18fa60d39bbe97afcab0b824b7712e00 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 09:47:46 -0300 Subject: [PATCH 156/237] Refactor chat and chatMessage to es6 classes --- webchat/utils/chat.js | 183 +++++++++++++++++------------------ webchat/utils/chatMessage.js | 14 +-- 2 files changed, 99 insertions(+), 98 deletions(-) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index 76c386351..d0c7615b9 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -3,115 +3,114 @@ const app = angular.module('webchat'); app.factory('Chat', ['ChatMessage', (ChatMessage) => { - let messages = []; - - function Chat(stream, selfId) { - this.selfId = selfId; - this.rpc = new RTCPeerConnection([{ - url: 'stun:stun.l.google.com:19302', - url: 'stun:stun2.l.google.com:19302', - url: 'stun:stun3.l.google.com:19302', - }]); - this.eventHandlers = {}; - stream.getTracks().forEach(t => { - this.rpc.addTrack(t, stream) - }); - this.rpc.onicecandidate = e => this.emit('ice-candidate-discovered', e); - this.sendChannel = this.rpc.createDataChannel('sendChannel'); - this.rpc.ondatachannel = this.handleDataChannel.bind(this); - this.rpc.ontrack = e => this.emit('track-received', e); - this.rpc.oniceconnectionstatechange = this.iceConnectionCB; - this.rpc.onsignalingstatechange = this.stateCB; - } - - Chat.prototype.emit = function(eventName, e) { - if (this.eventHandlers[eventName]) { - this.eventHandlers[eventName].forEach((f) => { - f(e); + const Chat = class Chat { + constructor(stream, selfId) { + this.selfId = selfId; + this.rpc = new RTCPeerConnection([{ + url: 'stun:stun.l.google.com:19302', + url: 'stun:stun2.l.google.com:19302', + url: 'stun:stun3.l.google.com:19302', + }]); + this.eventHandlers = {}; + stream.getTracks().forEach(t => { + this.rpc.addTrack(t, stream) }); + this.rpc.onicecandidate = e => this.emit('ice-candidate-discovered', e); + this.sendChannel = this.rpc.createDataChannel('sendChannel'); + this.rpc.ondatachannel = this.handleDataChannel.bind(this); + this.rpc.ontrack = e => this.emit('track-received', e); + this.rpc.oniceconnectionstatechange = this.handleIceConnectionState.bind(this); + this.rpc.onsignalingstatechange = this.handleState.bind(this); + this._currentMessages = []; } - } - Chat.prototype.on = function(eventName, f) { - if (!this.eventHandlers[eventName]) { - this.eventHandlers[eventName] = []; + emit(eventName, e) { + if (this.eventHandlers[eventName]) { + this.eventHandlers[eventName].forEach((f) => { + f(e); + }); + } } - this.eventHandlers[eventName].push(f); - } - - Chat.prototype.receiveCandidate = function(candidate) { - console.log('candidate received', candidate); - const rtcCandidate = new RTCIceCandidate(candidate); - this.rpc.addIceCandidate(rtcCandidate); - } - Chat.prototype.handleDataChannel = function(e) { - const chat = this; - e.channel.onmessage = channelEv => { - if (channelEv.data) { - const msg = new ChatMessage(channelEv.data); - chat.currentMessages.push(msg); - chat.emit('msg-list-updated', this.currentMessages) + on(eventName, f) { + if (!this.eventHandlers[eventName]) { + this.eventHandlers[eventName] = []; } - }; - } + this.eventHandlers[eventName].push(f); + } - Chat.prototype.iceConnectionCB = function(ev) { - console.log('ice connection changed', ev.target.iceConnectionState) - } + receiveCandidate(candidate) { + console.log('candidate received', candidate); + const rtcCandidate = new RTCIceCandidate(candidate); + this.rpc.addIceCandidate(rtcCandidate); + } - Chat.prototype.stateCB = function(ev) { - console.log('state changed', ev.target.signalingState); - } + handleDataChannel(e) { + const chat = this; + e.channel.onmessage = channelEv => { + if (channelEv.data) { + const msg = new ChatMessage(channelEv.data); + chat._currentMessages.push(msg); + chat.emit('msg-list-updated', chat.currentMessages) + } + }; + } - Chat.prototype.offer = function() { - return this.rpc.createOffer().then(offer => { - return this.rpc.setLocalDescription(offer).then(() => { - return offer; - }).catch(e => { - console.log('Erro em local description apos offer', e); - }); - }).catch(e => { - console.log('Erro em offer', e); - }); - } + handleIceConnectionState(ev) { + this.emit('ice-connection-changed', ev.target.iceConnectionState) + } - Chat.prototype.setRemote = function(remote) { - this.rpc.setRemoteDescription(remote); - } + handleState(ev) { + this.emit('state-changed', ev.target.signalingState) + } - Chat.prototype.accept = function(remote) { - return this.rpc.setRemoteDescription(remote).then(() => { - return this.rpc.createAnswer().then(answer => { - return this.rpc.setLocalDescription(answer).then(() => { - return answer; - }) + offer() { + return this.rpc.createOffer().then(offer => { + return this.rpc.setLocalDescription(offer).then(() => { + return offer; + }).catch(e => { + console.log('Erro em local description apos offer', e); + }); }).catch(e => { - console.log('Erro em answer', e); + console.log('Erro em offer', e); }); - }) - } + } - Chat.prototype.handleTrack = function(e) { - this.emit('track-received', e); - } + setRemote(remote) { + this.rpc.setRemoteDescription(remote); + } - Chat.prototype.sendMessage = function(message) { - const msgString = JSON.stringify({ - sender: this.selfId, - timestamp: Date.now(), - msg: message, - type: 'text', - }) - this.sendChannel.send(msgString); - messages.push(new ChatMessage(msgString)); - } + accept(remote) { + return this.rpc.setRemoteDescription(remote).then(() => { + return this.rpc.createAnswer().then(answer => { + return this.rpc.setLocalDescription(answer).then(() => { + return answer; + }) + }).catch(e => { + console.log('Erro em answer', e); + }); + }) + } + + handleTrack(e) { + this.emit('track-received', e); + } - Object.defineProperty(Chat.prototype, 'currentMessages', { - get: () => { - return messages.sort((p, n) => p.timestamp - n.timestamp); + sendMessage(message) { + const msgString = JSON.stringify({ + sender: this.selfId, + timestamp: Date.now(), + msg: message, + type: 'text', + }) + this.sendChannel.send(msgString); + this._currentMessages.push(new ChatMessage(msgString)); } - }) + + get currentMessages() { + return this._currentMessages.sort((p, n) => p.timestamp - n.timestamp); + } + } return Chat; }]) diff --git a/webchat/utils/chatMessage.js b/webchat/utils/chatMessage.js index a891eec15..b72e1ba11 100644 --- a/webchat/utils/chatMessage.js +++ b/webchat/utils/chatMessage.js @@ -4,12 +4,14 @@ const app = angular.module('webchat') app.factory('ChatMessage', [() => { - function ChatMessage(jsonString) { - const parsed = JSON.parse(jsonString); - this.sender = parsed.sender; - this.timestamp = parsed.timestamp; - this.msg = parsed.msg; - this.type = 'text'; + const ChatMessage = class ChatMessage { + constructor(jsonString) { + const parsed = JSON.parse(jsonString); + this.sender = parsed.sender; + this.timestamp = parsed.timestamp; + this.msg = parsed.msg; + this.type = 'text'; + } } return ChatMessage; From 9c76483c1b03b8bc764f911d5fc0ff7ba358eddd Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 12:04:39 -0300 Subject: [PATCH 157/237] Add jsdoc to chat.js --- webchat/utils/chat.js | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index d0c7615b9..005991028 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -4,6 +4,12 @@ app.factory('Chat', ['ChatMessage', (ChatMessage) => { const Chat = class Chat { + /** + * Creates a new Chat object, which will handle a webrtc peer connection, + * its events and video/audio/data channels functionality. + * @param {MediaStream} stream - video/audio stream object + * @param {string} selfId - firebase id of the current user + */ constructor(stream, selfId) { this.selfId = selfId; this.rpc = new RTCPeerConnection([{ @@ -24,6 +30,12 @@ this._currentMessages = []; } + /** + * Mimics node's on/emit event handlers. + * Raises an event. + * @param {string} eventName - name of the event + * @param {object} e - event data + */ emit(eventName, e) { if (this.eventHandlers[eventName]) { this.eventHandlers[eventName].forEach((f) => { @@ -32,6 +44,12 @@ } } + /** + * Mimics node's on/emit event handlers. + * Adds a callback to an event. + * @param {string} eventName - name of the event + * @param {Function} f - function to be called when event is raised. + */ on(eventName, f) { if (!this.eventHandlers[eventName]) { this.eventHandlers[eventName] = []; @@ -39,31 +57,79 @@ this.eventHandlers[eventName].push(f); } + /** + * Adds an ice candidate to the current connection, + * received from the websocket signaling server. + * @param {Object} candidate - RTCIceCandidate to be added to this connection + */ receiveCandidate(candidate) { console.log('candidate received', candidate); const rtcCandidate = new RTCIceCandidate(candidate); this.rpc.addIceCandidate(rtcCandidate); } + /** + * Handles data channel events from the RTC Peer Connection. + * Currently only message (text) events are handled, + * raising a msg-list-updated event. + * @param {Event} e - data channel event to be handled + * + * @fires Chat#msg-list-updated + */ handleDataChannel(e) { const chat = this; e.channel.onmessage = channelEv => { if (channelEv.data) { const msg = new ChatMessage(channelEv.data); chat._currentMessages.push(msg); + + /** + * Event when the currentMessages property has been updated. + * + * @event Chat#msg-list-updated + * @property [ChatMessage] - current list of ChatMessages + */ chat.emit('msg-list-updated', chat.currentMessages) } }; } + /** + * Handles a ice connection state change event, + * propagating it back as another event through the Chat object. + * Usefull for detecting when a connection is being attempted, + * disconnected or otherwise closed for some reason. + * Possible states are: + * 'new', 'checking', 'connected/completed', 'failed/disconnected/closed',. + * + * https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/iceConnectionState + * + * @param {Event} ev - full event of a ice connection state change. + * Its target is the current Remote Peer connection. + * + * @fires Chat#ice-connection-changed + */ handleIceConnectionState(ev) { this.emit('ice-connection-changed', ev.target.iceConnectionState) } + /** + * Handles a state connection change event, + * propagating it back as another event through the Chat object. + * + * @param {Event} ev - full event of a connection state change. + * Its target is the current Remote Peer connection. + * + * @fires Chat#state-changed + */ handleState(ev) { this.emit('state-changed', ev.target.signalingState) } + /** + * Starts a new RPC as the offerer, resolve the promise with the session object. + * + */ offer() { return this.rpc.createOffer().then(offer => { return this.rpc.setLocalDescription(offer).then(() => { @@ -76,10 +142,19 @@ }); } + /** + * Adds a new remote session object (answer) as the remote description of current Chat. + * Used to set the remote description when started as the offerer. + * @param {string} remote - remote session object. + */ setRemote(remote) { this.rpc.setRemoteDescription(remote); } + /** + * Starts a new RPC accepting a remote offer, resolves the promise with the answer object. + * @param {objet} remote - remote ssion object. + */ accept(remote) { return this.rpc.setRemoteDescription(remote).then(() => { return this.rpc.createAnswer().then(answer => { @@ -92,10 +167,20 @@ }) } + /** + * Handles a track added event and propagantes it back through the Chat object. + * The video/audio object can be obtained through e.streams[0]. + * @param {Event} e - event which contains the stream object and its tracks. + */ handleTrack(e) { this.emit('track-received', e); } + /** + * Sends a ChatMessage to the other user through the data channel. + * Adds Date.now() as the timestamp. + * @param {string} message - Message contents to be sent + */ sendMessage(message) { const msgString = JSON.stringify({ sender: this.selfId, From a9498977758f85d51d581afeec223bcfcccae6ca Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 14:30:23 -0300 Subject: [PATCH 158/237] Remove testing files from PR branch --- webchat/home/home.html | 29 ----------- webchat/home/homeController.js | 90 ++-------------------------------- 2 files changed, 4 insertions(+), 115 deletions(-) diff --git a/webchat/home/home.html b/webchat/home/home.html index 8a4309336..09fe625b0 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1,30 +1 @@ -

    HOME

    -
    - - - {{ usr }} - - -
    -
    - -

    {{ controller.getName(msg.sender)}}

    -

    {{ msg.msg }} ({{ controller.formatTime(msg.timestamp) }})

    -     -
    - -Send - - -
    diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 368e33af4..712a01eaf 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,97 +3,15 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', function HomeController (AuthService, UserService) { + webchat.controller('HomeController', function HomeController ($scope, $state) { const controller = this; - controller.userList = {}; - controller.client = {}; - controller.chat = {}; - controller.dest = ''; - controller.msg = ''; - controller.msgList = () => { - return controller.chat.currentMessages; - }; - - controller.sendMessage = () => { - controller.chat.sendMessage(controller.msg); - controller.msg = ''; - } - - controller.$onInit = () => { + const main = () => { console.log('HomeController running'); - controller.client = AuthService.getChatClient(); - controller.getUserList(controller.client.users); - controller.client.on('offer-received', callPrompt); - controller.client.on('user-list-update', controller.getUserList); - controller.client.on('chat-created', e => { - controller.chat = e.chat; - - controller.chat.on('msg-list-updated', ev => { - }) - - controller.chat.on('track-received', ev => { - console.log('track received', ev) - document.getElementById('video-remote').srcObject = ev.streams[0]; - }) - }) }; - controller.updateUsers = () => { - controller.client.requestUsers(); - } - - controller.getName = (id) => { - return this.userList[id]; - } - - controller.formatTime = (timestamp) => { - const date = new Date(timestamp); - return date.toLocaleTimeString(); - } + main(); - controller.call = (id) => { - getMedia().then(stream => { - controller.client.call(id, stream); - // angular.element not working here - document.getElementById('video-selfie').srcObject = stream; - }); - } - - controller.getUserList = (users) => { - let parsedList = {}; - if (users.forEach) { - users.forEach(userKey => { - UserService.getUser(userKey).then((res) => { - parsedList[userKey] = res.name; - }); - }); - - } - - controller.userList = parsedList; - } - - function callPrompt(id) { - const answer = confirm(`${id} has called. accept?`); - if (answer) { - getMedia().then(stream => { - controller.client.acceptCall(id, stream); - document.getElementById('video-selfie').srcObject = stream; - }); - } - } - - function getMedia() { - return new Promise((resolve, reject) => { - let stream = new MediaStream(); - navigator.mediaDevices.getUserMedia({video:true}).then(s => { - stream = s; - resolve(stream) - }).catch(_ => { - resolve(stream); - }) - }) - } }); + })(); From 559263ae022a4e741714a67d223e4809d08162d0 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 15:47:16 -0300 Subject: [PATCH 159/237] Add height:100% to #webchat selector --- webchat/styles/custom.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css index 7b060f208..49eab056c 100644 --- a/webchat/styles/custom.css +++ b/webchat/styles/custom.css @@ -10,6 +10,7 @@ html, body { animation-name: simple-fade-in; animation-duration: 2s; min-height: 100%; + height: 100%; } #content { @@ -72,4 +73,4 @@ html, body { 100% { opacity: 0; } -} \ No newline at end of file +} From bc96343f78880d76f4f72de200b69e7b8a642169 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 16:00:07 -0300 Subject: [PATCH 160/237] Change function parameter names on on/emit --- webchat/utils/chat.js | 14 +++++++------- webchat/utils/chatClient.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index 005991028..9ebcaa481 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -34,12 +34,12 @@ * Mimics node's on/emit event handlers. * Raises an event. * @param {string} eventName - name of the event - * @param {object} e - event data + * @param {object} event - event data */ - emit(eventName, e) { + emit(eventName, event) { if (this.eventHandlers[eventName]) { - this.eventHandlers[eventName].forEach((f) => { - f(e); + this.eventHandlers[eventName].forEach((callback) => { + callback(event); }); } } @@ -48,13 +48,13 @@ * Mimics node's on/emit event handlers. * Adds a callback to an event. * @param {string} eventName - name of the event - * @param {Function} f - function to be called when event is raised. + * @param {Function} callback - function to be called when event is raised. */ - on(eventName, f) { + on(eventName, callback) { if (!this.eventHandlers[eventName]) { this.eventHandlers[eventName] = []; } - this.eventHandlers[eventName].push(f); + this.eventHandlers[eventName].push(callback); } /** diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index d89329547..c283d969a 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -62,12 +62,12 @@ * Mimics node's on/emit event handlers. * Raises an event. * @param {string} eventName - name of the event - * @param {object} e - event data + * @param {object} event - event data */ - emit(eventName, e) { + emit(eventName, event) { if (this.eventHandlers[eventName]) { - this.eventHandlers[eventName].forEach((f) => { - f(e); + this.eventHandlers[eventName].forEach((callback) => { + callback(event); }); } } @@ -76,13 +76,13 @@ * Mimics node's on/emit event handlers. * Adds a callback to an event. * @param {string} eventName - name of the event - * @param {Function} f - function to be called when event is raised. + * @param {Function} callback - function to be called when event is raised. */ - on(eventName, f) { + on(eventName, callback) { if (!this.eventHandlers[eventName]) { this.eventHandlers[eventName] = []; } - this.eventHandlers[eventName].push(f); + this.eventHandlers[eventName].push(callback); } /** From e5036e7f990099a706283b143e05a033cc0bd820 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 16:02:00 -0300 Subject: [PATCH 161/237] Fix typo on session in chat.js --- webchat/utils/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index 9ebcaa481..d520c10f9 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -153,7 +153,7 @@ /** * Starts a new RPC accepting a remote offer, resolves the promise with the answer object. - * @param {objet} remote - remote ssion object. + * @param {objet} remote - remote session object. */ accept(remote) { return this.rpc.setRemoteDescription(remote).then(() => { From 76fe37ebd7c11eb50f8d290a61c0f20b31e033c1 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 29 Jan 2019 18:02:25 -0300 Subject: [PATCH 162/237] Add webchat constants back --- webchat/app.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webchat/app.js b/webchat/app.js index 38a55763b..30a8ec0c0 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -17,6 +17,12 @@ error: 'error', }); + app.constant('WEBSOCKET', { + hostname: window.location.hostname, + port: 8090, + maxRetries: 5, + }); + app.config((STATES, $mdIconProvider, $mdThemingProvider, $stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) => { $mdIconProvider.fontSet('md', 'material-icons'); From 1c802a4449af213e4143c2367043aeb96f61bd18 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Jan 2019 13:38:49 -0300 Subject: [PATCH 163/237] Add emptyStream (default stream) to chats * canvas.captureStream has low support % --- webchat/auth/authService.js | 2 +- webchat/utils/chat.js | 5 +++++ webchat/utils/chatClient.js | 40 +++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index 3acef1857..510ea57c6 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -206,7 +206,7 @@ if ($window.localStorage.userInfo) { const parse = JSON.parse($window.localStorage.userInfo); userInfo = new User(parse); - chatClient = new ChatClient(userInfo.key); + chatClient = new ChatClient(userInfo.key, userInfo.photo_url); } } diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index d520c10f9..ff0a75a3c 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -12,6 +12,7 @@ */ constructor(stream, selfId) { this.selfId = selfId; + this._selfStream = stream; this.rpc = new RTCPeerConnection([{ url: 'stun:stun.l.google.com:19302', url: 'stun:stun2.l.google.com:19302', @@ -30,6 +31,10 @@ this._currentMessages = []; } + get selfStream() { + return this._selfStream; + } + /** * Mimics node's on/emit event handlers. * Raises an event. diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index c283d969a..6359c461b 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -3,6 +3,26 @@ const app = angular.module('webchat'); app.factory('ChatClient', ['Chat', 'WEBSOCKET', (Chat, WEBSOCKET) => { + const createEmptyStream = (avatarUrl) => { + return new Promise((resolve, reject) => { + if (avatarUrl.indexOf('avatar.png') >= 0) { + avatarUrl = 'http://www.gravatar.com/avatar' + } + + const canvas = Object.assign(document.createElement('canvas'), { width: 320, height: 320 }); + const ctx = canvas.getContext('2d'); + const avatar = new Image(); + avatar.crossOrigin = 'anonymous'; + + avatar.onload = () => { + ctx.drawImage(avatar, 0, 0, 320, 320); + const stream = canvas.captureStream(1); + resolve(stream); + } + avatar.src = avatarUrl; + }); + } + const ChatClient = class ChatClient { /** * Create a new ChatClient (WebRTC wrapper), @@ -10,16 +30,22 @@ * The ChatClient also mediates connections by Chat objects * before a RPC connection is succesfully completed. * @param {string} id - firebase id of the user + * @param {string} avatarUrl - url of the user avatar */ - constructor(id) { + constructor(id, avatarUrl) { this.id = id; this.ws = {}; this.retries = 0; this.eventHandlers = {}; this.chats = {}; this.users = {}; - this.stream = undefined; this.startWebsocket(); + this._emptyStream; + createEmptyStream(avatarUrl).then(s => this._emptyStream = s); + } + + get emptyStream() { + return this._emptyStream; } /** @@ -298,9 +324,8 @@ * @param {string} id - id of the user to request a call * @param {MediaStream} stream - MediaStream video/audio object of the caller */ - requestCall(id, stream) { - this.stream = this.stream || stream; - this.chats[id] = this.createChat(id, this.stream); + requestCall(id, stream = this.emptyStream) { + this.chats[id] = this.createChat(id, stream); this.sendToWebsocket('call-request', id, {}); } @@ -309,9 +334,8 @@ * @param {string} id - id of the user who has called. * @param {MediaStream} stream - MediaStream video/audio object of the answerer */ - acceptCall(id, stream) { - this.stream = this.stream || stream; - this.createChat(id, this.stream); + acceptCall(id, stream = this.emptyStream) { + this.createChat(id, stream); this.sendToWebsocket('call-answer', id, {}); } From 0177e705e35701ba7356b5e5bfaac4b729492ef2 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Jan 2019 13:44:24 -0300 Subject: [PATCH 164/237] Add sendServerMessage method --- webchat/utils/chatClient.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index 6359c461b..b91345989 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -57,7 +57,7 @@ // Sends a signin message to the websocket as soon as the websocket connects this.ws.onopen = () => { - this.sendToWebsocket('signin', '', {}); + this.sendServerMessage('signin'); this.retries = 0; }; @@ -122,6 +122,15 @@ this.ws.send(JSON.stringify(msg)); } + /** + * Sends a message (JSON string) to the server, withou a target user. + * @param {string} type - type of message + * @param {object} data - contents of the message. defaults to empty object; + */ + sendServerMessage(type, data = {}) { + this.sendToWebsocket(type, '', data); + } + /** * Create a new Chat object associated to an id of another user * @param {string} id - firebase id of the other user @@ -343,7 +352,7 @@ * Requests the websocket a list of online users. */ requestUsers() { - this.sendToWebsocket('user-list-request', '', {}); + this.sendServerMessage('user-list-request'); } } From 5cfaef29705b84bd56e4298cda2279d75f691cd5 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Jan 2019 16:52:49 -0300 Subject: [PATCH 165/237] Remove authService.getChatClient() --- webchat/auth/authService.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index 510ea57c6..76eaa06b9 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -182,10 +182,6 @@ return false; }; - service.getChatClient = () => { - return chatClient; - } - /** * Execute each function stored to be thriggered when user logout * is called. From 46edfa8a0aba6480ed0a89887d3cf7f18a27b25e Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Jan 2019 17:11:52 -0300 Subject: [PATCH 166/237] Use a mapper on chatClient websocket handling --- webchat/utils/chatClient.js | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index b91345989..83750e834 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -156,8 +156,8 @@ /** * Handles events sent by the websocket server, - * parsing the string content on {e.data} as a javascript regular object. - * @param {MessageEvent} e - websocket event + * parsing the string content on {event.data} as a javascript regular object. + * @param {MessageEvent} event - websocket event * * @listens websocket#call-request * @listens websocket#call-answer @@ -171,28 +171,17 @@ console.log('ws event: ', msg.type); console.log(msg); - switch (msg.type) { - case 'call-request': - this.handleCallRequest(msg); - break; - case 'call-answer': - this.handleCallAnswer(msg); - break; - case 'rpc-offer': - this.handleRpcOffer(msg); - break; - case 'rpc-answer': - this.handleRpcAnswer(msg); - break; - case 'ice-candidate-received': - this.handleCandidateReceived(msg); - break; - case 'user-list-update': - this.handleUserListUpdate(msg); - break; - default: - this.emit('ws-message', msg); - break; + const handlersMap = { + 'call-request': this.handleCallRequest.bind(this), + 'call-answer': this.handleCallAnswer.bind(this), + 'rpc-offer': this.handleRpcOffer.bind(this), + 'rpc-answer': this.handleRpcAnswer.bind(this), + 'ice-candidate-received': this.handleCandidateReceived.bind(this), + 'user-list-update': this.handleUserListUpdate.bind(this), + } + + if (_.has(handlersMap, msg.type)) { + handlersMap[msg.type](msg); } } From df682e73bf7b4de6fc3d0732648aca2c362ea306 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Jan 2019 17:27:40 -0300 Subject: [PATCH 167/237] Add jsdoc to chatEmptyStream function --- webchat/utils/chatClient.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index 83750e834..a22ff9ebe 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -3,9 +3,14 @@ const app = angular.module('webchat'); app.factory('ChatClient', ['Chat', 'WEBSOCKET', (Chat, WEBSOCKET) => { + /** + * Create a new MediaStream with a static picture of the user avatar, + * or a standard gravatar icon if the user has no avatar + * @param {string} avatarUrl - url of the user avatar + */ const createEmptyStream = (avatarUrl) => { return new Promise((resolve, reject) => { - if (avatarUrl.indexOf('avatar.png') >= 0) { + if (_.isEmpty(avatarUrl) || avatarUrl.indexOf('avatar.png') >= 0) { avatarUrl = 'http://www.gravatar.com/avatar' } From 9ac7ffb25fa64c73e216cbd09658550ff56ec40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:28:29 -0300 Subject: [PATCH 168/237] Reorganize custom.css in several files --- webchat/index.html | 16 +++- webchat/styles/animations/simple-fade.css | 17 +++++ webchat/styles/custom.css | 76 ------------------- webchat/styles/custom/scrollbar.css | 18 +++++ webchat/styles/responsive/show-management.css | 11 +++ webchat/styles/utils/constants.css | 7 ++ webchat/styles/utils/scrollbar-management.css | 3 + webchat/styles/utils/text-management.css | 5 ++ 8 files changed, 75 insertions(+), 78 deletions(-) create mode 100644 webchat/styles/animations/simple-fade.css delete mode 100644 webchat/styles/custom.css create mode 100644 webchat/styles/custom/scrollbar.css create mode 100644 webchat/styles/responsive/show-management.css create mode 100644 webchat/styles/utils/constants.css create mode 100644 webchat/styles/utils/scrollbar-management.css create mode 100644 webchat/styles/utils/text-management.css diff --git a/webchat/index.html b/webchat/index.html index 7dc361ea6..d1b80dc3d 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -24,8 +24,20 @@ - - + + + + + + + + + + + + + + diff --git a/webchat/styles/animations/simple-fade.css b/webchat/styles/animations/simple-fade.css new file mode 100644 index 000000000..57f09d2fc --- /dev/null +++ b/webchat/styles/animations/simple-fade.css @@ -0,0 +1,17 @@ +@keyframes simple-fade-in { + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } +} + +@keyframes simple-fade-out { + 0% { + opacity: 1; + } + 100% { + opacity: 0; + } +} diff --git a/webchat/styles/custom.css b/webchat/styles/custom.css deleted file mode 100644 index 49eab056c..000000000 --- a/webchat/styles/custom.css +++ /dev/null @@ -1,76 +0,0 @@ -html, body { - height: 100%; - max-height: 100%; - overflow: hidden; -} - -#webchat { - overflow: hidden; - display: flex; - animation-name: simple-fade-in; - animation-duration: 2s; - min-height: 100%; - height: 100%; -} - -#content { - flex: 1; - min-height: 100%; - max-height: 100%; - display: flex; - height: 100%; - overflow: hidden; -} - -.hide-scrollbar::-webkit-scrollbar { - display: none; -} -.custom-scrollbar::-webkit-scrollbar { - width: .3em; - height: .3em; -} -.custom-scrollbar::-webkit-scrollbar-button { - background: #009688 -} -.custom-scrollbar::-webkit-scrollbar-track-piece { - background: #ccc -} -.custom-scrollbar::-webkit-scrollbar-thumb { - background: #009688 -} - -@media screen and (min-width: 1280px) { - .hide-on-desktop { - display: none; - } -} - -.no-padding { - padding: 0; -} - -.no-margin { - margin: 0; -} - -.fill-height { - height: 100%; -} - -@keyframes simple-fade-in { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } -} - -@keyframes simple-fade-out { - 0% { - opacity: 1; - } - 100% { - opacity: 0; - } -} diff --git a/webchat/styles/custom/scrollbar.css b/webchat/styles/custom/scrollbar.css new file mode 100644 index 000000000..6fba77e80 --- /dev/null +++ b/webchat/styles/custom/scrollbar.css @@ -0,0 +1,18 @@ +.custom-scrollbar::-webkit-scrollbar { + width: .3em; + height: .3em; +} +.custom-scrollbar::-webkit-scrollbar-button { + background: var(--custom-scrollbar-color); +} +.custom-scrollbar::-webkit-scrollbar-track-piece { + background: var(--custom-scrollbar-background); +} +.custom-scrollbar::-webkit-scrollbar-thumb { + background: var(--custom-scrollbar-color); +} + +.custom-scrollbar { + scrollbar-color: #009688 #ccc; + scrollbar-width: thin; +} diff --git a/webchat/styles/responsive/show-management.css b/webchat/styles/responsive/show-management.css new file mode 100644 index 000000000..7fbdf7ffa --- /dev/null +++ b/webchat/styles/responsive/show-management.css @@ -0,0 +1,11 @@ +@media screen and (max-width: 450px) { + .hide-on-mobile { + display: none; + } +} + +@media screen and (min-width: 1280px) { + .hide-on-desktop { + display: none; + } +} \ No newline at end of file diff --git a/webchat/styles/utils/constants.css b/webchat/styles/utils/constants.css new file mode 100644 index 000000000..4bbed4354 --- /dev/null +++ b/webchat/styles/utils/constants.css @@ -0,0 +1,7 @@ +:root { + --custom-scrollbar-background: #ccc; + --custom-scrollbar-color: #009688; + + --responsive-mobile-width: 450px; + --responsive-desktop-width: 1280px; +} \ No newline at end of file diff --git a/webchat/styles/utils/scrollbar-management.css b/webchat/styles/utils/scrollbar-management.css new file mode 100644 index 000000000..9cc2cc2c6 --- /dev/null +++ b/webchat/styles/utils/scrollbar-management.css @@ -0,0 +1,3 @@ +.hide-scrollbar::-webkit-scrollbar { + display: none; +} \ No newline at end of file diff --git a/webchat/styles/utils/text-management.css b/webchat/styles/utils/text-management.css new file mode 100644 index 000000000..72756cb4f --- /dev/null +++ b/webchat/styles/utils/text-management.css @@ -0,0 +1,5 @@ +.wrap-ellipsis { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} From be2325e1c993dc63c214e525d9f7a37d661805d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:31:52 -0300 Subject: [PATCH 169/237] Refactor contacts sidenav reorganizing css classes and moving files --- .../contacts-sidenav.component.js | 2 +- .../components/contacts/contacts-sidenav.css | 19 ++++++++++++++ .../components/contacts/contacts-sidenav.html | 15 +++++++++++ webchat/components/contacts/contacts.css | 26 ------------------- .../contacts/list/contacts-list.css | 11 ++++++++ .../contacts/list/contacts-list.html | 17 +++++++++--- .../contacts/sidenav/contacts-sidenav.html | 9 ------- .../contacts/toolbar/contacts-toolbar.css | 11 ++++++++ .../contacts/toolbar/contacts-toolbar.html | 13 ++++++++-- webchat/index.html | 9 ++++++- 10 files changed, 89 insertions(+), 43 deletions(-) rename webchat/components/contacts/{sidenav => }/contacts-sidenav.component.js (90%) create mode 100644 webchat/components/contacts/contacts-sidenav.css create mode 100644 webchat/components/contacts/contacts-sidenav.html delete mode 100644 webchat/components/contacts/contacts.css create mode 100644 webchat/components/contacts/list/contacts-list.css delete mode 100644 webchat/components/contacts/sidenav/contacts-sidenav.html create mode 100644 webchat/components/contacts/toolbar/contacts-toolbar.css diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.component.js b/webchat/components/contacts/contacts-sidenav.component.js similarity index 90% rename from webchat/components/contacts/sidenav/contacts-sidenav.component.js rename to webchat/components/contacts/contacts-sidenav.component.js index a51ccd8f5..655095397 100644 --- a/webchat/components/contacts/sidenav/contacts-sidenav.component.js +++ b/webchat/components/contacts/contacts-sidenav.component.js @@ -10,7 +10,7 @@ * */ angular.module("webchat").component("contactsSidenav", { - templateUrl: "app/components/contacts/sidenav/contacts-sidenav.html", + templateUrl: "app/components/contacts/contacts-sidenav.html", controller: contactsSidenavController, controllerAs: "contactsSidenavCtrl", bindings: { diff --git a/webchat/components/contacts/contacts-sidenav.css b/webchat/components/contacts/contacts-sidenav.css new file mode 100644 index 000000000..8a96a9a1e --- /dev/null +++ b/webchat/components/contacts/contacts-sidenav.css @@ -0,0 +1,19 @@ +.contacts-sidenav { + height: 100%; + width: 100%; + display: grid; + grid-template-rows: 56px calc(100% - 56px); + grid-template-areas: + 'sidenav__toolbar' + 'sidenav__list'; +} + +.contacts-sidenav__toolbar { + height: 100%; + grid-area: sidenav__toolbar; +} + +.contacts-sidenav__list { + grid-area: sidenav__list; + overflow-y: scroll; +} \ No newline at end of file diff --git a/webchat/components/contacts/contacts-sidenav.html b/webchat/components/contacts/contacts-sidenav.html new file mode 100644 index 000000000..d69e5cb66 --- /dev/null +++ b/webchat/components/contacts/contacts-sidenav.html @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/webchat/components/contacts/contacts.css b/webchat/components/contacts/contacts.css deleted file mode 100644 index b797ea32e..000000000 --- a/webchat/components/contacts/contacts.css +++ /dev/null @@ -1,26 +0,0 @@ -.contacts-list { - overflow: hidden; - flex: 1; -} - -.contacts-list-container { - overflow-y: scroll; -} - -.user-contact { - font-size: 1.5em; - line-height: 1em; -} - -.close-button { - margin-right: auto; -} - -.contacts-search { - margin-left: auto; -} - -.no-contacts-message { - text-align: center; - align-self: center; -} \ No newline at end of file diff --git a/webchat/components/contacts/list/contacts-list.css b/webchat/components/contacts/list/contacts-list.css new file mode 100644 index 000000000..93c937a02 --- /dev/null +++ b/webchat/components/contacts/list/contacts-list.css @@ -0,0 +1,11 @@ +.contacts-list__container { + padding: 0; +} + +.contacts-list__contact { + font-size: 1.2em; +} + +.contacts-list__no-contacts-msg { + text-align: center; +} \ No newline at end of file diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 674f1f1ee..5538537ef 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,7 +1,16 @@ - - - + + + + -

    Não há contatos online no momento.

    +

    Não há contatos online no momento.

     \ No newline at end of file diff --git a/webchat/components/contacts/sidenav/contacts-sidenav.html b/webchat/components/contacts/sidenav/contacts-sidenav.html deleted file mode 100644 index 88d02a1af..000000000 --- a/webchat/components/contacts/sidenav/contacts-sidenav.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.css b/webchat/components/contacts/toolbar/contacts-toolbar.css new file mode 100644 index 000000000..6e37ae77a --- /dev/null +++ b/webchat/components/contacts/toolbar/contacts-toolbar.css @@ -0,0 +1,11 @@ +.toolbar__container { + padding: 10px 0; + width: 100%; + display: flex; + flex-direction: row; + align-items: center; +} + +.toolbar__search-bar { + width: 100%; +} \ No newline at end of file diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.html b/webchat/components/contacts/toolbar/contacts-toolbar.html index d903788c5..e887ec204 100644 --- a/webchat/components/contacts/toolbar/contacts-toolbar.html +++ b/webchat/components/contacts/toolbar/contacts-toolbar.html @@ -1,2 +1,11 @@ - - +
    + + + + +
    diff --git a/webchat/index.html b/webchat/index.html index d1b80dc3d..32bc68d80 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -50,6 +50,12 @@ + + + + + + @@ -111,10 +117,11 @@ + - + From 890a5f589ce594bd2e47c67a018a04b838d121f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:32:50 -0300 Subject: [PATCH 170/237] Remove outside icon click event bug --- webchat/components/icon-button/icon-button.component.js | 1 + webchat/components/icon-button/icon-button.css | 3 --- webchat/components/icon-button/icon-button.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 webchat/components/icon-button/icon-button.css diff --git a/webchat/components/icon-button/icon-button.component.js b/webchat/components/icon-button/icon-button.component.js index 96ada0066..fa34060bd 100644 --- a/webchat/components/icon-button/icon-button.component.js +++ b/webchat/components/icon-button/icon-button.component.js @@ -17,6 +17,7 @@ bindings: { icon: "@", iconColor: "@", + action: '<', }, }); diff --git a/webchat/components/icon-button/icon-button.css b/webchat/components/icon-button/icon-button.css deleted file mode 100644 index 0eb250913..000000000 --- a/webchat/components/icon-button/icon-button.css +++ /dev/null @@ -1,3 +0,0 @@ -.icon-button { - margin: 0; -} \ No newline at end of file diff --git a/webchat/components/icon-button/icon-button.html b/webchat/components/icon-button/icon-button.html index f4ebff76c..de63ad5d2 100644 --- a/webchat/components/icon-button/icon-button.html +++ b/webchat/components/icon-button/icon-button.html @@ -1,4 +1,4 @@ - + {{iconButtonCtrl.icon}} From f11ce14ab241b644d4c5b114f93552a1a11d437e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:33:54 -0300 Subject: [PATCH 171/237] Refactor user-description using grid and text-overflow --- .../user-description.component.js | 6 +--- .../user-description/user-description.css | 36 ++++++++++--------- .../user-description/user-description.html | 10 +++--- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/webchat/components/user-description/user-description.component.js b/webchat/components/user-description/user-description.component.js index 91c7a59d5..1cbbfe84d 100644 --- a/webchat/components/user-description/user-description.component.js +++ b/webchat/components/user-description/user-description.component.js @@ -15,7 +15,7 @@ controllerAs: "userDescriptionCtrl", bindings: { name: "@", - description: "@", + text: "@", avatar: "@", }, }); @@ -23,10 +23,6 @@ function userDescriptionController() { const userDescriptionCtrl = this; - userDescriptionCtrl.charLimitName = Utils.isMobileScreen() ? 15 : 25; - userDescriptionCtrl.charLimitDescription = Utils.isMobileScreen() ? 20 : 35; - userDescriptionCtrl.limitString = (string, charLimit) => Utils.limitString(string, charLimit); - } })(); \ No newline at end of file diff --git a/webchat/components/user-description/user-description.css b/webchat/components/user-description/user-description.css index 1464b508d..0b3b4c503 100644 --- a/webchat/components/user-description/user-description.css +++ b/webchat/components/user-description/user-description.css @@ -1,25 +1,29 @@ -.user-description-container { - display: flex; - flex-direction: row; - font-size: 0.8em; +.user-description { + display: grid; + grid-template-columns: max-content auto; + grid-template-rows: max-content max-content; + grid-template-areas: + 'avatar name' + 'avatar text'; + grid-gap: 0 10px; + padding: 10px 0; + align-items: center; } -.avatar { - padding: 10px; - height: 50px; - width: 50px; +.user-description__avatar { + grid-area: avatar; + height: 3em; + width: 3em; border-radius: 50%; } -.user-text { - align-content: center; - align-self: center; - display: flex; - flex-direction: column; - padding: 0; - margin: 0; +.user-description__name { + grid-area: name; + line-height: 16px; } -.user-description { +.user-description__text { + grid-area: text; font-size: 0.8em; + line-height: 16px; } \ No newline at end of file diff --git a/webchat/components/user-description/user-description.html b/webchat/components/user-description/user-description.html index 188f78a35..2691bbf5e 100644 --- a/webchat/components/user-description/user-description.html +++ b/webchat/components/user-description/user-description.html @@ -1,7 +1,5 @@ -
    - -
    - {{userDescriptionCtrl.limitString(userDescriptionCtrl.name, userDescriptionCtrl.charLimitName)}} - {{userDescriptionCtrl.limitString(userDescriptionCtrl.description, userDescriptionCtrl.charLimitDescription)}} -
    +
    + + {{userDescriptionCtrl.name }} + {{userDescriptionCtrl.text }}
    \ No newline at end of file From 8ee43bab40c89da9d72593d8816a050b5b7eeb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:34:52 -0300 Subject: [PATCH 172/237] Refactor expansive search bar using BEM nomenclature --- .../expansive-search-bar.css | 45 ++++++++++++++----- .../expansive-search-bar.html | 13 ++++-- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.css b/webchat/components/expansive-search-bar/expansive-search-bar.css index f8df9d914..43e83e9c4 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.css +++ b/webchat/components/expansive-search-bar/expansive-search-bar.css @@ -1,10 +1,9 @@ -.search-container { +.expansive-search__container { display: flex; flex-direction: row; - display: 100%; } -.expansive-search-input { +.expansive-search__input { width: 100%; border-radius: 50px; padding: 0 20px; @@ -13,12 +12,38 @@ outline: none; } -.expansive-search-input.ng-enter { - animation-name: simple-fade-in; - animation-duration: 0.25s; +.expansive-search__input.ng-enter { + animation-name: width-expansion-in; + animation-duration: 0.75s; } -.expansive-search-input.ng-leave { - animation-name: simple-fade-out; - animation-duration: 0.25s; -} \ No newline at end of file +.expansive-search__input.ng-leave { + animation-name: width-expansion-out; + animation-duration: 0.75s; +} + + +/* Expand element in width direction */ +@keyframes width-expansion-in { + 0% { + width: 0; + padding: 0; + } + + 100% { + width: 100%; + padding: 0 20px; + } +} + +@keyframes width-expansion-out { + 0% { + width: 100%; + padding: 0 20px; + } + + 100% { + width: 0; + padding: 0; + } +} diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.html b/webchat/components/expansive-search-bar/expansive-search-bar.html index 3c845cbb1..a92cdaf2f 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.html +++ b/webchat/components/expansive-search-bar/expansive-search-bar.html @@ -1,4 +1,11 @@ -
    - - +
    + + +
    From 0c0281c2ddc500ce4d2735e46d30cccfc62c5ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:37:23 -0300 Subject: [PATCH 173/237] Refactor ecis-header using BEM nomenclature --- webchat/components/header/ecis-header.html | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index f155fc5d7..f5d410fb5 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -1,6 +1,21 @@ -
    - - - - +
    + + + + + + +
    \ No newline at end of file From 8fa19474bf2693b82c66cab6ae0981179c4d8cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:38:21 -0300 Subject: [PATCH 174/237] Refactor CSS grid --- webchat/components/header/ecis-header.css | 27 +++++++++++++++++++++++ webchat/ecis.css | 12 +++++++++- webchat/home/home.css | 15 +++++++++++++ webchat/home/home.html | 4 +++- webchat/webchat/webchat.css | 19 ++++++++++++++++ webchat/webchat/webchat.html | 6 +++-- 6 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 webchat/components/header/ecis-header.css create mode 100644 webchat/home/home.css create mode 100644 webchat/webchat/webchat.css diff --git a/webchat/components/header/ecis-header.css b/webchat/components/header/ecis-header.css new file mode 100644 index 000000000..caed6238e --- /dev/null +++ b/webchat/components/header/ecis-header.css @@ -0,0 +1,27 @@ +.ecis-header { + padding: 0; + display: grid; + grid-template-columns: max-content max-content auto max-content; + grid-template-areas: + 'toggle-btn logo user-description logout-btn'; + align-itens: center; +} + +.ecis-header__toggle-sidenav-btn { + grid-area: toggle-btn; +} + +.ecis-header__logo { + grid-area: logo; +} + +.ecis-header__current-user { + grid-area: user-description; + font-size: 1rem; + margin: 0 10px; + justify-self: flex-end; +} + +.ecis-header__logout-btn { + grid-area: logout-btn; +} diff --git a/webchat/ecis.css b/webchat/ecis.css index b76c6be46..b10ce0758 100644 --- a/webchat/ecis.css +++ b/webchat/ecis.css @@ -1,4 +1,14 @@ - ec-content { +html, body { + height: 100%; + max-height: 100%; +} + +#webchat { + height: 100%; + max-height: 100%; +} + +ec-content { display: grid; align-items: center; justify-items: center; diff --git a/webchat/home/home.css b/webchat/home/home.css new file mode 100644 index 000000000..ca4a29dad --- /dev/null +++ b/webchat/home/home.css @@ -0,0 +1,15 @@ +.home-content { + height: 100%; + display: grid; + grid-template-columns: auto max-content; + grid-template-rows: 100%; + grid-template-areas: + 'sidenav chat'; +} + +.home-sidenav { + height: 100%; + max-height: 100%; + width: 100%; + grid-area: sidenav; +} diff --git a/webchat/home/home.html b/webchat/home/home.html index 4700ebff1..ea9bb8d52 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1 +1,3 @@ - +
    + +
    diff --git a/webchat/webchat/webchat.css b/webchat/webchat/webchat.css new file mode 100644 index 000000000..3dde1b912 --- /dev/null +++ b/webchat/webchat/webchat.css @@ -0,0 +1,19 @@ +.webchat__container { + height: 100%; + display: grid; + grid-template-columns: 100%; + grid-template-rows: 64px calc(100% - 64px); + grid-template-areas: + 'header' + 'content'; + animation-name: simple-fade-in; + animation-duration: 0.5s; +} + +.webchat__header { + grid-area: header; +} + +.webchat__content { + grid-area: content; +} \ No newline at end of file diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html index f19d55998..d615c7bb5 100644 --- a/webchat/webchat/webchat.html +++ b/webchat/webchat/webchat.html @@ -1,2 +1,4 @@ - -
    \ No newline at end of file +
    + +
    +
    From 300ace428018e97bb04877b69ffec9ea0f163529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:38:35 -0300 Subject: [PATCH 175/237] Add CSS imports to index.html --- webchat/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webchat/index.html b/webchat/index.html index 32bc68d80..7e935f60c 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -42,13 +42,15 @@ + + - - - - + + + + From 8fa3ef4561a8853dd65b81459bb81fb4cbdb0c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:40:29 -0300 Subject: [PATCH 176/237] Fix contacts list height --- webchat/components/contacts/contacts-sidenav.css | 1 + 1 file changed, 1 insertion(+) diff --git a/webchat/components/contacts/contacts-sidenav.css b/webchat/components/contacts/contacts-sidenav.css index 8a96a9a1e..d79d62df6 100644 --- a/webchat/components/contacts/contacts-sidenav.css +++ b/webchat/components/contacts/contacts-sidenav.css @@ -14,6 +14,7 @@ } .contacts-sidenav__list { + height: 100%; grid-area: sidenav__list; overflow-y: scroll; } \ No newline at end of file From 63c6813afd0eea87c91e0dfa4ed41d4d999b6408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:55:30 -0300 Subject: [PATCH 177/237] Fix home grid to fit chat --- webchat/home/home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/home/home.css b/webchat/home/home.css index ca4a29dad..cc8d354f1 100644 --- a/webchat/home/home.css +++ b/webchat/home/home.css @@ -1,7 +1,7 @@ .home-content { height: 100%; display: grid; - grid-template-columns: auto max-content; + grid-template-columns: max-content auto; grid-template-rows: 100%; grid-template-areas: 'sidenav chat'; From f5e75c8c0296fcb8f96e77946ddd67b59a405f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 30 Jan 2019 19:56:55 -0300 Subject: [PATCH 178/237] Add BEM nomenclature to home html --- webchat/home/home.css | 8 ++++++-- webchat/home/home.html | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/webchat/home/home.css b/webchat/home/home.css index cc8d354f1..f38673d48 100644 --- a/webchat/home/home.css +++ b/webchat/home/home.css @@ -1,4 +1,4 @@ -.home-content { +.home__content { height: 100%; display: grid; grid-template-columns: max-content auto; @@ -7,9 +7,13 @@ 'sidenav chat'; } -.home-sidenav { +.home__sidenav { height: 100%; max-height: 100%; width: 100%; grid-area: sidenav; } + +.home__chat { + grid-area: chat; +} diff --git a/webchat/home/home.html b/webchat/home/home.html index ea9bb8d52..2f19105a3 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1,3 +1,3 @@ -
    - +
    +
    From c608c9e4cda7a63f29eb93ecb15ee16fda5cb2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 31 Jan 2019 12:00:33 -0300 Subject: [PATCH 179/237] Fix contacts toolbar size --- webchat/components/contacts/contacts-sidenav.css | 4 +++- webchat/components/contacts/contacts-sidenav.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webchat/components/contacts/contacts-sidenav.css b/webchat/components/contacts/contacts-sidenav.css index d79d62df6..84de962b0 100644 --- a/webchat/components/contacts/contacts-sidenav.css +++ b/webchat/components/contacts/contacts-sidenav.css @@ -2,7 +2,7 @@ height: 100%; width: 100%; display: grid; - grid-template-rows: 56px calc(100% - 56px); + grid-template-rows: 64px calc(100% - 64px); grid-template-areas: 'sidenav__toolbar' 'sidenav__list'; @@ -10,6 +10,8 @@ .contacts-sidenav__toolbar { height: 100%; + max-height: 64px; + padding: 0 10px; grid-area: sidenav__toolbar; } diff --git a/webchat/components/contacts/contacts-sidenav.html b/webchat/components/contacts/contacts-sidenav.html index d69e5cb66..ee2d7c0cd 100644 --- a/webchat/components/contacts/contacts-sidenav.html +++ b/webchat/components/contacts/contacts-sidenav.html @@ -5,7 +5,7 @@ md-disable-backdrop md-whiteframe="4"> Date: Thu, 31 Jan 2019 14:20:03 -0300 Subject: [PATCH 180/237] Remove console.log statements --- webchat/utils/chat.js | 11 ++--------- webchat/utils/chatClient.js | 5 ----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index ff0a75a3c..ffd48d558 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -68,7 +68,6 @@ * @param {Object} candidate - RTCIceCandidate to be added to this connection */ receiveCandidate(candidate) { - console.log('candidate received', candidate); const rtcCandidate = new RTCIceCandidate(candidate); this.rpc.addIceCandidate(rtcCandidate); } @@ -139,11 +138,7 @@ return this.rpc.createOffer().then(offer => { return this.rpc.setLocalDescription(offer).then(() => { return offer; - }).catch(e => { - console.log('Erro em local description apos offer', e); - }); - }).catch(e => { - console.log('Erro em offer', e); + }) }); } @@ -166,9 +161,7 @@ return this.rpc.setLocalDescription(answer).then(() => { return answer; }) - }).catch(e => { - console.log('Erro em answer', e); - }); + }) }) } diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index a22ff9ebe..4112fcecf 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -82,7 +82,6 @@ retryWebSocket() { if (this.retries < WEBSOCKET.maxRetries) { this.retries += 1; - console.log('Retrying connection, retry: ', this.retries); setTimeout(function () { this.startWebsocket() }.bind(this), 5000) @@ -173,8 +172,6 @@ */ handleWebSocket(event) { const msg = JSON.parse(event.data); - console.log('ws event: ', msg.type); - console.log(msg); const handlersMap = { 'call-request': this.handleCallRequest.bind(this), @@ -246,7 +243,6 @@ */ handleRpcOffer(msg) { const id = msg.id; - console.log('offer received, answering ', id); const chat = this.chats[id]; chat.on('ice-candidate-discovered', e => this.handleDiscoveredIceCandidates(id, e)); chat.accept(msg.data).then(connection => { @@ -317,7 +313,6 @@ */ handleDiscoveredIceCandidates(id, event) { if (event.candidate) { - console.log('candidate discovered', event.candidate); this.sendToWebsocket('ice-candidate', id, event.candidate); } } From d23e6769893f7c743760ef7c53161e546e93db9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 6 Feb 2019 15:26:44 -0300 Subject: [PATCH 181/237] Add css grid to contacts toolbar --- .../contacts/toolbar/contacts-toolbar.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/webchat/components/contacts/toolbar/contacts-toolbar.css b/webchat/components/contacts/toolbar/contacts-toolbar.css index 6e37ae77a..931213554 100644 --- a/webchat/components/contacts/toolbar/contacts-toolbar.css +++ b/webchat/components/contacts/toolbar/contacts-toolbar.css @@ -1,11 +1,18 @@ .toolbar__container { padding: 10px 0; width: 100%; - display: flex; - flex-direction: row; - align-items: center; + display: grid; + grid-template-columns: max-content auto; + grid-template-rows: 100%; + grid-template-areas: + 'close-btn search-bar'; +} + +.toolbar__close-btn { + grid-area: close-btn; } .toolbar__search-bar { width: 100%; + grid-area: search-bar; } \ No newline at end of file From 529aaa8707359253b09676fee49a2174c0e79e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 6 Feb 2019 16:22:38 -0300 Subject: [PATCH 182/237] Replace units in px for units in em --- webchat/components/contacts/contacts-sidenav.css | 6 +++--- .../expansive-search-bar/expansive-search-bar.css | 8 ++++---- webchat/components/header/ecis-header.css | 2 +- webchat/components/logo/logo.css | 6 +++--- webchat/components/user-description/user-description.css | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/webchat/components/contacts/contacts-sidenav.css b/webchat/components/contacts/contacts-sidenav.css index 84de962b0..725ff41ce 100644 --- a/webchat/components/contacts/contacts-sidenav.css +++ b/webchat/components/contacts/contacts-sidenav.css @@ -2,7 +2,7 @@ height: 100%; width: 100%; display: grid; - grid-template-rows: 64px calc(100% - 64px); + grid-template-rows: 4em calc(100% - 4em); grid-template-areas: 'sidenav__toolbar' 'sidenav__list'; @@ -10,8 +10,8 @@ .contacts-sidenav__toolbar { height: 100%; - max-height: 64px; - padding: 0 10px; + max-height: 4em; + padding: 0 0.6em; grid-area: sidenav__toolbar; } diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.css b/webchat/components/expansive-search-bar/expansive-search-bar.css index 43e83e9c4..808ff3692 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.css +++ b/webchat/components/expansive-search-bar/expansive-search-bar.css @@ -5,8 +5,8 @@ .expansive-search__input { width: 100%; - border-radius: 50px; - padding: 0 20px; + border-radius: 4em; + padding: 0 1.2em; background-color: #EEEEEE; border: none; outline: none; @@ -32,14 +32,14 @@ 100% { width: 100%; - padding: 0 20px; + padding: 0 1.2em; } } @keyframes width-expansion-out { 0% { width: 100%; - padding: 0 20px; + padding: 0 1.2em; } 100% { diff --git a/webchat/components/header/ecis-header.css b/webchat/components/header/ecis-header.css index caed6238e..431d2a704 100644 --- a/webchat/components/header/ecis-header.css +++ b/webchat/components/header/ecis-header.css @@ -18,7 +18,7 @@ .ecis-header__current-user { grid-area: user-description; font-size: 1rem; - margin: 0 10px; + margin: 0 0.6em; justify-self: flex-end; } diff --git a/webchat/components/logo/logo.css b/webchat/components/logo/logo.css index d705fa922..a1308cbdb 100644 --- a/webchat/components/logo/logo.css +++ b/webchat/components/logo/logo.css @@ -1,7 +1,7 @@ .logo { - height: 40px; + height: 2em; width: auto; - margin: 0 10px; + margin: 0 0.6em; } .logo-responsive { @@ -23,6 +23,6 @@ @media screen and (max-width: 320px) { .logo-responsive { width: auto; - height: 28px; + height: 1em; } } \ No newline at end of file diff --git a/webchat/components/user-description/user-description.css b/webchat/components/user-description/user-description.css index 0b3b4c503..3b8dc1c18 100644 --- a/webchat/components/user-description/user-description.css +++ b/webchat/components/user-description/user-description.css @@ -5,8 +5,8 @@ grid-template-areas: 'avatar name' 'avatar text'; - grid-gap: 0 10px; - padding: 10px 0; + grid-gap: 0 0.6rem; + padding: 0.6rem 0; align-items: center; } @@ -19,11 +19,11 @@ .user-description__name { grid-area: name; - line-height: 16px; + line-height: 1rem; } .user-description__text { grid-area: text; font-size: 0.8em; - line-height: 16px; + line-height: 1rem; } \ No newline at end of file From baf882e84a8e41606e87ed91a4c30cc189e71e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 6 Feb 2019 16:56:17 -0300 Subject: [PATCH 183/237] Removes chat state --- webchat/app.js | 10 ---------- webchat/chat/chat.html | 0 webchat/chat/chatController.js | 11 ----------- webchat/index.html | 1 - 4 files changed, 22 deletions(-) delete mode 100644 webchat/chat/chat.html delete mode 100644 webchat/chat/chatController.js diff --git a/webchat/app.js b/webchat/app.js index 30a8ec0c0..d64051c79 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -12,7 +12,6 @@ app.constant('STATES', { abstract: 'webchat', home: `${rootName}.home`, - chat: `${rootName}.chat`, login: 'login', error: 'error', }); @@ -53,15 +52,6 @@ }, }, }) - .state(STATES.chat, { - url: "/chat", - views: { - content: { - templateUrl: "app/chat/chat.html", - controller: "ChatController as controller", - }, - }, - }) .state(STATES.login, { url: "/login", views: { diff --git a/webchat/chat/chat.html b/webchat/chat/chat.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/webchat/chat/chatController.js b/webchat/chat/chatController.js deleted file mode 100644 index 466f5592f..000000000 --- a/webchat/chat/chatController.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - const webchat = angular.module('webchat'); - - webchat.controller('ChatController', function ChatController () { - const chatController = this; - - }); - -})(); \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index f37100b09..72536717a 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -110,7 +110,6 @@ - From 5ccee9d2a6509c3c9c3da32ef11cdf3d007359fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 09:01:31 -0300 Subject: [PATCH 184/237] Add close ws on logout --- webchat/auth/authService.js | 1 + webchat/utils/chatClient.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/webchat/auth/authService.js b/webchat/auth/authService.js index 76eaa06b9..9f91d5d0b 100644 --- a/webchat/auth/authService.js +++ b/webchat/auth/authService.js @@ -152,6 +152,7 @@ delete $window.localStorage.userInfo; userInfo = undefined; clearInterval(refreshInterval); + chatClient.closeClient(); executeLogoutListeners(); diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index 4112fcecf..1770a30f8 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -88,6 +88,11 @@ } } + closeClient() { + this.ws.onclose = () => {}; + this.ws.close(); + } + /** * Mimics node's on/emit event handlers. * Raises an event. From 22131cbc6ddc8ca1738731f36a738104261bd10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 09:09:45 -0300 Subject: [PATCH 185/237] Extracts general input class from specific class --- .../expansive-search-bar/expansive-search-bar.html | 2 +- webchat/index.html | 1 + webchat/styles/custom/custom.css | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 webchat/styles/custom/custom.css diff --git a/webchat/components/expansive-search-bar/expansive-search-bar.html b/webchat/components/expansive-search-bar/expansive-search-bar.html index a92cdaf2f..53272bbb1 100644 --- a/webchat/components/expansive-search-bar/expansive-search-bar.html +++ b/webchat/components/expansive-search-bar/expansive-search-bar.html @@ -1,6 +1,6 @@
    + diff --git a/webchat/styles/custom/custom.css b/webchat/styles/custom/custom.css new file mode 100644 index 000000000..4da3533e0 --- /dev/null +++ b/webchat/styles/custom/custom.css @@ -0,0 +1,8 @@ +.custom-input { + width: 100%; + border-radius: 50px; + padding: 0 20px; + background-color: #EEEEEE; + border: none; + outline: none; +} \ No newline at end of file From 6c7e2b0cacce8a6078d05ce9e9ac54dabadf5010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 09:11:06 -0300 Subject: [PATCH 186/237] Add toggle icon button --- .../toggle-button/toggle-button.component.js | 32 +++++++++++++++++++ .../toggle-button/toggle-button.css | 0 .../toggle-button/toggle-button.html | 15 +++++++++ webchat/index.html | 1 + 4 files changed, 48 insertions(+) create mode 100644 webchat/components/toggle-button/toggle-button.component.js create mode 100644 webchat/components/toggle-button/toggle-button.css create mode 100644 webchat/components/toggle-button/toggle-button.html diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js new file mode 100644 index 000000000..afdcfbcd0 --- /dev/null +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -0,0 +1,32 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("toggleButton", { + templateUrl: "app/components/toggle-button/toggle-button.html", + controller: toggleButtonController, + controllerAs: "toggleButtonCtrl", + bindings: { + iconOn: '@', + iconOff: '@', + iconColorOn: '@', + iconColorOff: '@', + action: '<', + }, + }); + + function toggleButtonController() { + const toggleButtonCtrl = this; + + toggleButtonCtrl.$onInit = () => { + toggleButtonCtrl.active = true; + toggleButtonCtrl.iconColorOff = toggleButtonCtrl.iconColorOff || '#EEE'; + toggleButtonCtrl.iconColorOn = toggleButtonCtrl.iconColorOn || '#EEE'; + }; + + toggleButtonCtrl.toggle = () => { + toggleButtonCtrl.active = !toggleButtonCtrl.active; + toggleButtonCtrl.action(); + }; + } + +})(); \ No newline at end of file diff --git a/webchat/components/toggle-button/toggle-button.css b/webchat/components/toggle-button/toggle-button.css new file mode 100644 index 000000000..e69de29bb diff --git a/webchat/components/toggle-button/toggle-button.html b/webchat/components/toggle-button/toggle-button.html new file mode 100644 index 000000000..a8fdfe341 --- /dev/null +++ b/webchat/components/toggle-button/toggle-button.html @@ -0,0 +1,15 @@ + + + {{ toggleButtonCtrl.iconOn }} + + + {{ toggleButtonCtrl.iconOff }} + + \ No newline at end of file diff --git a/webchat/index.html b/webchat/index.html index f06a90a0e..1fd34be0a 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -117,6 +117,7 @@ + From 9ba78f27f96bebdd629d6dbca382cf5c59221229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 09:12:51 -0300 Subject: [PATCH 187/237] Modify contacts list to receive open chat function and show user email --- webchat/components/contacts/contacts-sidenav.component.js | 1 + webchat/components/contacts/contacts-sidenav.html | 1 + webchat/components/contacts/list/contacts-list.component.js | 3 ++- webchat/components/contacts/list/contacts-list.html | 6 +++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/webchat/components/contacts/contacts-sidenav.component.js b/webchat/components/contacts/contacts-sidenav.component.js index 655095397..f2346246e 100644 --- a/webchat/components/contacts/contacts-sidenav.component.js +++ b/webchat/components/contacts/contacts-sidenav.component.js @@ -15,6 +15,7 @@ controllerAs: "contactsSidenavCtrl", bindings: { contacts: "<", + openChat: "<", }, }); diff --git a/webchat/components/contacts/contacts-sidenav.html b/webchat/components/contacts/contacts-sidenav.html index ee2d7c0cd..12a3af319 100644 --- a/webchat/components/contacts/contacts-sidenav.html +++ b/webchat/components/contacts/contacts-sidenav.html @@ -11,5 +11,6 @@ \ No newline at end of file diff --git a/webchat/components/contacts/list/contacts-list.component.js b/webchat/components/contacts/list/contacts-list.component.js index 89e7ff213..69e5952f9 100644 --- a/webchat/components/contacts/list/contacts-list.component.js +++ b/webchat/components/contacts/list/contacts-list.component.js @@ -14,7 +14,8 @@ controllerAs: "contactsListCtrl", bindings: { searchQuery: "<", - contacts: "<" + contacts: "<", + openChat: "<", }, }); diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 5538537ef..5355da2eb 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -1,16 +1,16 @@ + text="{{user.email[0]}}"> -

    Não há contatos online no momento.

    +

    Não há contatos online no momento.

     \ No newline at end of file From 2f4099170f874f26c4bff1cc0b4c3ca81ffee0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 09:13:42 -0300 Subject: [PATCH 188/237] Add icon button disabled state --- webchat/components/icon-button/icon-button.component.js | 3 +++ webchat/components/icon-button/icon-button.html | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webchat/components/icon-button/icon-button.component.js b/webchat/components/icon-button/icon-button.component.js index fa34060bd..243f3cdbc 100644 --- a/webchat/components/icon-button/icon-button.component.js +++ b/webchat/components/icon-button/icon-button.component.js @@ -18,6 +18,7 @@ icon: "@", iconColor: "@", action: '<', + disabled: '<', }, }); @@ -26,7 +27,9 @@ iconButtonCtrl.$onInit = () => { iconButtonCtrl.iconColor = iconButtonCtrl.iconColor || "#EEE"; + iconButtonCtrl.disabled = iconButtonCtrl.disabled || false; }; + } })(); \ No newline at end of file diff --git a/webchat/components/icon-button/icon-button.html b/webchat/components/icon-button/icon-button.html index de63ad5d2..70dd0dbc1 100644 --- a/webchat/components/icon-button/icon-button.html +++ b/webchat/components/icon-button/icon-button.html @@ -1,5 +1,5 @@ - - + + {{iconButtonCtrl.icon}} \ No newline at end of file From 39db1ffedad3a7fb45fb3d978790acff47030a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Feb 2019 12:47:11 -0300 Subject: [PATCH 189/237] Add lodash defaults to toggle button and icon button --- .../components/icon-button/icon-button.component.js | 7 +++++-- .../toggle-button/toggle-button.component.js | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/webchat/components/icon-button/icon-button.component.js b/webchat/components/icon-button/icon-button.component.js index 243f3cdbc..ec2b275a0 100644 --- a/webchat/components/icon-button/icon-button.component.js +++ b/webchat/components/icon-button/icon-button.component.js @@ -26,8 +26,11 @@ const iconButtonCtrl = this; iconButtonCtrl.$onInit = () => { - iconButtonCtrl.iconColor = iconButtonCtrl.iconColor || "#EEE"; - iconButtonCtrl.disabled = iconButtonCtrl.disabled || false; + _.defaults(iconButtonCtrl, { + iconColor: "#EEE", + action: () => {}, + disabled: false, + }); }; } diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index afdcfbcd0..537e8dc5d 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -18,9 +18,14 @@ const toggleButtonCtrl = this; toggleButtonCtrl.$onInit = () => { - toggleButtonCtrl.active = true; - toggleButtonCtrl.iconColorOff = toggleButtonCtrl.iconColorOff || '#EEE'; - toggleButtonCtrl.iconColorOn = toggleButtonCtrl.iconColorOn || '#EEE'; + console.log(toggleButtonCtrl); + _.defaults(toggleButtonCtrl, { + active: true, + iconColorOn: "#EEE", + iconColorOff: "#EEE", + action: () => {} + }); + console.log(toggleButtonCtrl); }; toggleButtonCtrl.toggle = () => { From c52787326a0b82e2df0af066d219e3b912a96dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Feb 2019 13:00:55 -0300 Subject: [PATCH 190/237] Add toggle-button jsdoc --- .../toggle-button/toggle-button.component.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index 537e8dc5d..02ce563c5 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -1,6 +1,24 @@ (function () { 'use strict'; + /** + * Button that calls an action and changes its icon on click. + * It receives as a binding an icon to shown when on and an + * icon to show when off. Also it receives an action to be + * called on click and the icons color when on and off. If + * the icon color is not passed, its color will be a default + * one (#EEE). + * @class toggleButton + * @example + * + * + * + */ angular.module("webchat").component("toggleButton", { templateUrl: "app/components/toggle-button/toggle-button.html", controller: toggleButtonController, From 7905a45353241074ce25026522221c7ec969dc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 14 Feb 2019 13:51:02 -0300 Subject: [PATCH 191/237] Refacts toggle-button component --- .../toggle-button/toggle-button.component.js | 12 +++++++++++ .../toggle-button/toggle-button.html | 20 +++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index 02ce563c5..c3575f400 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -50,6 +50,18 @@ toggleButtonCtrl.active = !toggleButtonCtrl.active; toggleButtonCtrl.action(); }; + + Object.defineProperty(toggleButtonCtrl, 'activeIcon', { + get: () => { + return toggleButtonCtrl.active ? toggleButtonCtrl.iconOn : toggleButtonCtrl.iconOff; + }, + }); + + Object.defineProperty(toggleButtonCtrl, 'activeIconColor', { + get: () => { + return toggleButtonCtrl.active ? toggleButtonCtrl.iconColorOn : toggleButtonCtrl.iconColorOff; + }, + }); } })(); \ No newline at end of file diff --git a/webchat/components/toggle-button/toggle-button.html b/webchat/components/toggle-button/toggle-button.html index a8fdfe341..b066812bf 100644 --- a/webchat/components/toggle-button/toggle-button.html +++ b/webchat/components/toggle-button/toggle-button.html @@ -1,15 +1,5 @@ - - - {{ toggleButtonCtrl.iconOn }} - - - {{ toggleButtonCtrl.iconOff }} - - \ No newline at end of file + + \ No newline at end of file From b75a113853c9a0e6cc47690b432f3dc7d93ecf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 12:51:51 -0300 Subject: [PATCH 192/237] Change webchat folder and files to be referenced as main --- webchat/app.js | 10 +++++----- webchat/ecis.css | 7 +------ webchat/index.html | 6 +++--- webchat/{webchat/webchat.css => main/main.css} | 6 +++--- webchat/main/main.html | 4 ++++ webchat/main/mainController.js | 12 ++++++++++++ webchat/webchat/webchat.html | 4 ---- webchat/webchat/webchatController.js | 12 ------------ 8 files changed, 28 insertions(+), 33 deletions(-) rename webchat/{webchat/webchat.css => main/main.css} (83%) create mode 100644 webchat/main/main.html create mode 100644 webchat/main/mainController.js delete mode 100644 webchat/webchat/webchat.html delete mode 100644 webchat/webchat/webchatController.js diff --git a/webchat/app.js b/webchat/app.js index d64051c79..11431b295 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -8,9 +8,9 @@ 'firebase', ]); - const rootName = 'webchat'; + const rootName = 'main'; app.constant('STATES', { - abstract: 'webchat', + abstract: rootName, home: `${rootName}.home`, login: 'login', error: 'error', @@ -36,9 +36,9 @@ abstract: true, views: { main: { - templateUrl: "app/webchat/webchat.html", - controller: "WebchatController", - controllerAs: "webchatCtrl", + templateUrl: "app/main/main.html", + controller: "mainController", + controllerAs: "mainCtrl", }, }, }) diff --git a/webchat/ecis.css b/webchat/ecis.css index b10ce0758..5cb6d8aaf 100644 --- a/webchat/ecis.css +++ b/webchat/ecis.css @@ -1,9 +1,4 @@ -html, body { - height: 100%; - max-height: 100%; -} - -#webchat { +html, body, #main { height: 100%; max-height: 100%; } diff --git a/webchat/index.html b/webchat/index.html index 1fd34be0a..5d91c4f0e 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -44,7 +44,7 @@ - + @@ -62,7 +62,7 @@ -
    +
    - + diff --git a/webchat/webchat/webchat.css b/webchat/main/main.css similarity index 83% rename from webchat/webchat/webchat.css rename to webchat/main/main.css index 3dde1b912..f59069010 100644 --- a/webchat/webchat/webchat.css +++ b/webchat/main/main.css @@ -1,4 +1,4 @@ -.webchat__container { +.main__container { height: 100%; display: grid; grid-template-columns: 100%; @@ -10,10 +10,10 @@ animation-duration: 0.5s; } -.webchat__header { +.main__header { grid-area: header; } -.webchat__content { +.main__content { grid-area: content; } \ No newline at end of file diff --git a/webchat/main/main.html b/webchat/main/main.html new file mode 100644 index 000000000..8f21e5aa6 --- /dev/null +++ b/webchat/main/main.html @@ -0,0 +1,4 @@ +
    + +
    +
    diff --git a/webchat/main/mainController.js b/webchat/main/mainController.js new file mode 100644 index 000000000..70f58a270 --- /dev/null +++ b/webchat/main/mainController.js @@ -0,0 +1,12 @@ +(function () { + 'use strict'; + + const webchat = angular.module('webchat'); + + webchat.controller('mainController', ['AuthService', function mainController (AuthService) { + const mainCtrl = this; + + mainCtrl.user = AuthService.getCurrentUser(); + }]); + +})(); \ No newline at end of file diff --git a/webchat/webchat/webchat.html b/webchat/webchat/webchat.html deleted file mode 100644 index d615c7bb5..000000000 --- a/webchat/webchat/webchat.html +++ /dev/null @@ -1,4 +0,0 @@ -
    - -
    -
    diff --git a/webchat/webchat/webchatController.js b/webchat/webchat/webchatController.js deleted file mode 100644 index 338dcd989..000000000 --- a/webchat/webchat/webchatController.js +++ /dev/null @@ -1,12 +0,0 @@ -(function () { - 'use strict'; - - const webchat = angular.module('webchat'); - - webchat.controller('WebchatController', ['AuthService', function WebchatController (AuthService) { - const webchatCtrl = this; - - webchatCtrl.user = AuthService.getCurrentUser(); - }]); - -})(); \ No newline at end of file From 318578d535da7901c573195eaaae33f1809ebe27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:13:07 -0300 Subject: [PATCH 193/237] Add chat-message component --- .../chat/message/chat-message.component.js | 35 +++++++++++++++++++ .../components/chat/message/chat-message.css | 28 +++++++++++++++ .../components/chat/message/chat-message.html | 4 +++ 3 files changed, 67 insertions(+) create mode 100644 webchat/components/chat/message/chat-message.component.js create mode 100644 webchat/components/chat/message/chat-message.css create mode 100644 webchat/components/chat/message/chat-message.html diff --git a/webchat/components/chat/message/chat-message.component.js b/webchat/components/chat/message/chat-message.component.js new file mode 100644 index 000000000..84cc30538 --- /dev/null +++ b/webchat/components/chat/message/chat-message.component.js @@ -0,0 +1,35 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("chatMessage", { + templateUrl: "app/components/chat/message/chat-message.html", + controller: [ + 'AuthService', + chatMessageController, + ], + controllerAs: "chatMessageCtrl", + bindings: { + messageObj: '<', + }, + }); + + function chatMessageController(AuthService) { + const chatMessageCtrl = this; + + + chatMessageCtrl.formatTimestamp = (timestamp) => { + return timestamp.getHours() + ":" + timestamp.getMinutes(); + }; + + chatMessageCtrl.$onInit = () => { + const timestamp = new Date(chatMessageCtrl.messageObj.timestamp); + chatMessageCtrl.formattedTimestamp = chatMessageCtrl.formatTimestamp(timestamp); + }; + + chatMessageCtrl.messageSent = () => { + const result = chatMessageCtrl.messageObj.sender === AuthService.getCurrentUser().key; + return result; + }; + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/message/chat-message.css b/webchat/components/chat/message/chat-message.css new file mode 100644 index 000000000..0c244fb3e --- /dev/null +++ b/webchat/components/chat/message/chat-message.css @@ -0,0 +1,28 @@ +.chat-message__container { + width: fit-content; + max-width: 60%; + padding: 5px 10px; + background: #FFFFFF; + margin: 2px 5px; + border: 1px solid black; + border-radius: 5px; + display: grid; + grid-template-columns: auto auto; + grid-template-areas: + 'text timestamp'; +} + +.chat-message__text { + grid-area: text; +} + +.chat-message__time { + grid-area: timestamp; + font-size: 0.8em; + align-self: flex-end; + margin: 0 10px; +} + +.chat-message--sent { + margin-left: auto; +} \ No newline at end of file diff --git a/webchat/components/chat/message/chat-message.html b/webchat/components/chat/message/chat-message.html new file mode 100644 index 000000000..9bec975f3 --- /dev/null +++ b/webchat/components/chat/message/chat-message.html @@ -0,0 +1,4 @@ +
    + {{ chatMessageCtrl.messageObj.msg }} + {{ chatMessageCtrl.formattedTimestamp }} +
    \ No newline at end of file From 52cbc129f350aeb46a5e248a2301607c8f24ec35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:15:28 -0300 Subject: [PATCH 194/237] Add chat-buttons component --- .../chat/buttons/chat-buttons.component.js | 18 ++++++++++++++++++ .../components/chat/buttons/chat-buttons.css | 0 .../components/chat/buttons/chat-buttons.html | 1 + 3 files changed, 19 insertions(+) create mode 100644 webchat/components/chat/buttons/chat-buttons.component.js create mode 100644 webchat/components/chat/buttons/chat-buttons.css create mode 100644 webchat/components/chat/buttons/chat-buttons.html diff --git a/webchat/components/chat/buttons/chat-buttons.component.js b/webchat/components/chat/buttons/chat-buttons.component.js new file mode 100644 index 000000000..08bf5d7ea --- /dev/null +++ b/webchat/components/chat/buttons/chat-buttons.component.js @@ -0,0 +1,18 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("chatButtons", { + templateUrl: "app/components/chat/buttons/chat-buttons.html", + controller: chatButtonsController, + controllerAs: "chatButtonsCtrl", + bindings: { + callFunc: "<", + }, + }); + + function chatButtonsController() { + const chatButtonsCtrl = this; + + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/buttons/chat-buttons.css b/webchat/components/chat/buttons/chat-buttons.css new file mode 100644 index 000000000..e69de29bb diff --git a/webchat/components/chat/buttons/chat-buttons.html b/webchat/components/chat/buttons/chat-buttons.html new file mode 100644 index 000000000..7240fd019 --- /dev/null +++ b/webchat/components/chat/buttons/chat-buttons.html @@ -0,0 +1 @@ + \ No newline at end of file From 22689ecc85ddba8973efce18b5a501114dd4202f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:15:58 -0300 Subject: [PATCH 195/237] Add chat-input component --- .../chat/input/chat-input.component.js | 39 +++++++++++++++++++ webchat/components/chat/input/chat-input.css | 22 +++++++++++ webchat/components/chat/input/chat-input.html | 14 +++++++ 3 files changed, 75 insertions(+) create mode 100644 webchat/components/chat/input/chat-input.component.js create mode 100644 webchat/components/chat/input/chat-input.css create mode 100644 webchat/components/chat/input/chat-input.html diff --git a/webchat/components/chat/input/chat-input.component.js b/webchat/components/chat/input/chat-input.component.js new file mode 100644 index 000000000..768511a44 --- /dev/null +++ b/webchat/components/chat/input/chat-input.component.js @@ -0,0 +1,39 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("chatInput", { + templateUrl: "app/components/chat/input/chat-input.html", + controller: chatInputController, + controllerAs: "chatInputCtrl", + bindings: { + sendMessageFunc: "<", + state: "<" + }, + }); + + function chatInputController() { + const chatInputCtrl = this; + + chatInputCtrl.getState = () => chatInputCtrl.state; + + chatInputCtrl.getStateStyle = () => { + const state = chatInputCtrl.getState(); + if (_.includes(['connected', 'complete'], state)) { + return 'lawngreen'; + } else if (_.includes(['failed', 'disconnected', 'closed'], state)) { + return 'red'; + } else if (_.includes(['new', 'checking'], state)) { + return 'goldenrod'; + } + return 'lightgray'; + }; + + chatInputCtrl.sendMessage = () => { + if (chatInputCtrl.msg) { + chatInputCtrl.sendMessageFunc(chatInputCtrl.msg); + chatInputCtrl.msg = ''; + } + }; + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/input/chat-input.css b/webchat/components/chat/input/chat-input.css new file mode 100644 index 000000000..1f9764359 --- /dev/null +++ b/webchat/components/chat/input/chat-input.css @@ -0,0 +1,22 @@ +.chat-input__container { + height: 100%; + width: 100%; + display: flex; + align-content: center; + align-items: center; +} + +.chat-input__connection-state { + margin-left: 10px; +} + +.chat-input__text { + width: 100%; + height: 70%; + margin: 0 0 0 10px; + background: #FFFFFF; +} + +.chat-input__text:disabled { + background: #dddddd; +} \ No newline at end of file diff --git a/webchat/components/chat/input/chat-input.html b/webchat/components/chat/input/chat-input.html new file mode 100644 index 000000000..d62da383d --- /dev/null +++ b/webchat/components/chat/input/chat-input.html @@ -0,0 +1,14 @@ +
    +

    ⬤

    + + + +
    From f3e940cf021b2870465fe7c9f0eb414a675cec94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:16:25 -0300 Subject: [PATCH 196/237] Add chat-body component --- .../components/chat/body/chat-body.component.js | 17 +++++++++++++++++ webchat/components/chat/body/chat-body.css | 8 ++++++++ webchat/components/chat/body/chat-body.html | 7 +++++++ 3 files changed, 32 insertions(+) create mode 100644 webchat/components/chat/body/chat-body.component.js create mode 100644 webchat/components/chat/body/chat-body.css create mode 100644 webchat/components/chat/body/chat-body.html diff --git a/webchat/components/chat/body/chat-body.component.js b/webchat/components/chat/body/chat-body.component.js new file mode 100644 index 000000000..cc3c4f4bc --- /dev/null +++ b/webchat/components/chat/body/chat-body.component.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("chatBody", { + templateUrl: "app/components/chat/body/chat-body.html", + controller: chatBodyController, + controllerAs: "chatBodyCtrl", + bindings: { + messages: '<', + }, + }); + + function chatBodyController() { + const chatBodyCtrl = this; + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css new file mode 100644 index 000000000..161d82c13 --- /dev/null +++ b/webchat/components/chat/body/chat-body.css @@ -0,0 +1,8 @@ +.chat-body__container { + height: 100%; + max-height: 100%; + display: flex; + flex-direction: column; + overflow-y: scroll; + justify-content: flex-end; +} diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html new file mode 100644 index 000000000..48bd48557 --- /dev/null +++ b/webchat/components/chat/body/chat-body.html @@ -0,0 +1,7 @@ +
    + + +
    \ No newline at end of file From 33470526108c8f4d4032aafcd98f139bd8c8da77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:16:40 -0300 Subject: [PATCH 197/237] Add chat-header component --- .../chat/header/chat-header.component.js | 19 +++++++++++++++++++ .../components/chat/header/chat-header.css | 17 +++++++++++++++++ .../components/chat/header/chat-header.html | 8 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 webchat/components/chat/header/chat-header.component.js create mode 100644 webchat/components/chat/header/chat-header.css create mode 100644 webchat/components/chat/header/chat-header.html diff --git a/webchat/components/chat/header/chat-header.component.js b/webchat/components/chat/header/chat-header.component.js new file mode 100644 index 000000000..f8949a503 --- /dev/null +++ b/webchat/components/chat/header/chat-header.component.js @@ -0,0 +1,19 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("chatHeader", { + templateUrl: "app/components/chat/header/chat-header.html", + controller: chatHeaderController, + controllerAs: "chatHeaderCtrl", + bindings: { + user: "<", + chat: "<", + callFunc: "<", + }, + }); + + function chatHeaderController() { + const chatHeaderCtrl = this; + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/header/chat-header.css b/webchat/components/chat/header/chat-header.css new file mode 100644 index 000000000..b5f28f0bd --- /dev/null +++ b/webchat/components/chat/header/chat-header.css @@ -0,0 +1,17 @@ +.chat-header__container { + display: grid; + grid-template-columns: auto max-content; + grid-template-areas: + 'current-user video-buttons'; + align-items: center; +} + +.chat-header__current-user { + grid-area: current-user; + margin: 0 10px; + color: #EEEEEE; +} + +.chat-header__buttons { + grid-area: video-buttons; +} \ No newline at end of file diff --git a/webchat/components/chat/header/chat-header.html b/webchat/components/chat/header/chat-header.html new file mode 100644 index 000000000..c357f885f --- /dev/null +++ b/webchat/components/chat/header/chat-header.html @@ -0,0 +1,8 @@ +
    + + +
    From bd755364f3adb0f7aa333c852e676e1c0a893dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:16:55 -0300 Subject: [PATCH 198/237] Add ecis-chat-component --- .../components/chat/ecis-chat.component.js | 28 +++++++++++++++++++ webchat/components/chat/ecis-chat.css | 25 +++++++++++++++++ webchat/components/chat/ecis-chat.html | 16 +++++++++++ 3 files changed, 69 insertions(+) create mode 100644 webchat/components/chat/ecis-chat.component.js create mode 100644 webchat/components/chat/ecis-chat.css create mode 100644 webchat/components/chat/ecis-chat.html diff --git a/webchat/components/chat/ecis-chat.component.js b/webchat/components/chat/ecis-chat.component.js new file mode 100644 index 000000000..a80eb9cab --- /dev/null +++ b/webchat/components/chat/ecis-chat.component.js @@ -0,0 +1,28 @@ +(function () { + 'use strict'; + + angular.module("webchat").component("ecisChat", { + templateUrl: "app/components/chat/ecis-chat.html", + controller: ecisChatController, + controllerAs: "ecisChatCtrl", + bindings: { + chat: '<', + user: '<', + callFunc: '<', + state: '<', + }, + }); + + function ecisChatController() { + const ecisChatCtrl = this; + + ecisChatCtrl.sendMessage = (msg) => { + ecisChatCtrl.chat.sendMessage(msg); + }; + + ecisChatCtrl.call = () => { + ecisChatCtrl.callFunc(ecisChatCtrl.user); + }; + } + +})(); \ No newline at end of file diff --git a/webchat/components/chat/ecis-chat.css b/webchat/components/chat/ecis-chat.css new file mode 100644 index 000000000..ee8a080f5 --- /dev/null +++ b/webchat/components/chat/ecis-chat.css @@ -0,0 +1,25 @@ +.chat__container { + height: 100%; + background: #EEEEEE; + display: grid; + grid-template-rows: 64px calc(100% - 64px - 48px) 48px; + grid-template-areas: + 'header' + 'body' + 'input'; +} + +.chat__header { + grid-area: header; + background: #009688; +} + +.chat__body { + grid-area: body; + background: #E5DDD3; +} + +.chat__input { + grid-area: input; + background: #009688; +} \ No newline at end of file diff --git a/webchat/components/chat/ecis-chat.html b/webchat/components/chat/ecis-chat.html new file mode 100644 index 000000000..b46d04748 --- /dev/null +++ b/webchat/components/chat/ecis-chat.html @@ -0,0 +1,16 @@ +
    + + + + + + +
    From bc43450001a952d8e0167d9965de51d9797bd555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:17:38 -0300 Subject: [PATCH 199/237] Add chat components imports --- webchat/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/webchat/index.html b/webchat/index.html index 5d91c4f0e..5308c018d 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -58,6 +58,14 @@ + + + + + + + + @@ -125,6 +133,13 @@ + + + + + + + From ffd092c6039d52b5205d0a117bc713c411c6545f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:18:27 -0300 Subject: [PATCH 200/237] Add chat component implementation --- .../toggle-button/toggle-button.component.js | 2 - webchat/home/home.html | 10 ++- webchat/home/homeController.js | 69 ++++++++++++++++++- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index c3575f400..94c0874d4 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -36,14 +36,12 @@ const toggleButtonCtrl = this; toggleButtonCtrl.$onInit = () => { - console.log(toggleButtonCtrl); _.defaults(toggleButtonCtrl, { active: true, iconColorOn: "#EEE", iconColorOff: "#EEE", action: () => {} }); - console.log(toggleButtonCtrl); }; toggleButtonCtrl.toggle = () => { diff --git a/webchat/home/home.html b/webchat/home/home.html index 2f19105a3..c4e19a178 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -1,3 +1,11 @@
    - + + +
    diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index fa8beabbb..b69a562bf 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,11 +3,74 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', ['WebchatService', function HomeController (WebchatService) { + webchat.controller('HomeController', ['UserService', 'AuthService', 'WebchatService', 'MessageService', '$scope', function HomeController (UserService, AuthService, WebchatService, MessageService, $scope) { const homeCtrl = this; - homeCtrl.contacts = WebchatService.getContacts(); + homeCtrl.$onInit = () => { + homeCtrl.client = AuthService.chatClient; + homeCtrl.cachedUsers = {}; - }]); + homeCtrl.getUserList(homeCtrl.client.users); + homeCtrl.client.on('user-list-updated', homeCtrl.getUserList); + homeCtrl.client.on('call-requested', homeCtrl.promptCall); + homeCtrl.client.on('chat-created', homeCtrl.chatCreated); + }; + + homeCtrl.getUserList = (users) => { + const parsedUsers = []; + + if (users.forEach) { + users.forEach(userKey => { + if (userKey !== homeCtrl.client.id) { + if (!_.has(homeCtrl.cachedUsers, userKey)) { + UserService.getUser(userKey).then(user => { + homeCtrl.cachedUsers[userKey] = user; + parsedUsers.push(homeCtrl.cachedUsers[userKey]); + }); + } else { + parsedUsers.push(homeCtrl.cachedUsers[userKey]); + } + } + }); + } + homeCtrl.contacts = parsedUsers; + }; + + homeCtrl.openChat = (user) => { + homeCtrl.currentUser = user; + console.log(homeCtrl.client.chats[user.key]); + }; + homeCtrl.chatCreated = (e) => { + UserService.getUser(e.id).then(user => { + homeCtrl.currentChat = e.chat; + homeCtrl.currentUser = user; + homeCtrl.currentChat.on('ice-connection-changed', homeCtrl.stateChange); + homeCtrl.currentChat.on('msg-list-updated', list => { + $scope.$apply(); + }); + }); + }; + + homeCtrl.stateChange = (state) => { + homeCtrl.state = state; + console.log(state); + $scope.$apply(); + }; + + homeCtrl.call = (user) => { + homeCtrl.client.requestCall(user.key); + homeCtrl.openChat(user); + }; + + homeCtrl.promptCall = (id) => { + UserService.getUser(id).then(user => { + MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { + if (answer) { + homeCtrl.client.acceptCall(id); + } + }); + }); + }; + }]); })(); From 52b38e8ce7d517df2a2d5b5f9b21d08362df341b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 13:21:20 -0300 Subject: [PATCH 201/237] Fix ecis-header user description to receive email --- webchat/components/header/ecis-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/header/ecis-header.html b/webchat/components/header/ecis-header.html index f5d410fb5..a1eb40357 100644 --- a/webchat/components/header/ecis-header.html +++ b/webchat/components/header/ecis-header.html @@ -11,7 +11,7 @@ class="ecis-header__current-user" name="{{headerCtrl.user.name}}" avatar="{{headerCtrl.user.photo_url}}" - text="{{headerCtrl.user.current_institution.name}}"> + text="{{headerCtrl.user.email[0]}}"> Date: Thu, 7 Mar 2019 15:09:30 -0300 Subject: [PATCH 202/237] Remove unused WebchatService --- webchat/services/WebchatService.js | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 webchat/services/WebchatService.js diff --git a/webchat/services/WebchatService.js b/webchat/services/WebchatService.js deleted file mode 100644 index 6977c4a15..000000000 --- a/webchat/services/WebchatService.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - angular.module("webchat").service('WebchatService', function WebchatService() { - const WebchatService = this; - - WebchatService.getContacts = () => []; - - - }); -})(); \ No newline at end of file From 74d7f951fe871431e08365d805f69acca9c00b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:12:23 -0300 Subject: [PATCH 203/237] Remove WebchatService imports --- webchat/home/homeController.js | 2 +- webchat/index.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index b69a562bf..c659a827f 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,7 +3,7 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', ['UserService', 'AuthService', 'WebchatService', 'MessageService', '$scope', function HomeController (UserService, AuthService, WebchatService, MessageService, $scope) { + webchat.controller('HomeController', ['UserService', 'AuthService', 'MessageService', '$scope', function HomeController (UserService, AuthService, MessageService, $scope) { const homeCtrl = this; homeCtrl.$onInit = () => { diff --git a/webchat/index.html b/webchat/index.html index 5308c018d..4718ee2a2 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -115,7 +115,6 @@ - From c64ab076a2bf46c8283935c7993f17cc5b090677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:29:15 -0300 Subject: [PATCH 204/237] Remove all console.log calls --- webchat/home/homeController.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index c659a827f..c2effcf76 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -38,7 +38,6 @@ homeCtrl.openChat = (user) => { homeCtrl.currentUser = user; - console.log(homeCtrl.client.chats[user.key]); }; homeCtrl.chatCreated = (e) => { @@ -54,7 +53,6 @@ homeCtrl.stateChange = (state) => { homeCtrl.state = state; - console.log(state); $scope.$apply(); }; From 0db69b1363b69868a048cf6741aa9af60e56c86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:29:39 -0300 Subject: [PATCH 205/237] Replace default forEach for lodash forEach --- webchat/home/homeController.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index c2effcf76..4de3f6d31 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -19,20 +19,18 @@ homeCtrl.getUserList = (users) => { const parsedUsers = []; - if (users.forEach) { - users.forEach(userKey => { - if (userKey !== homeCtrl.client.id) { - if (!_.has(homeCtrl.cachedUsers, userKey)) { - UserService.getUser(userKey).then(user => { - homeCtrl.cachedUsers[userKey] = user; - parsedUsers.push(homeCtrl.cachedUsers[userKey]); - }); - } else { + _.forEach(users, userKey => { + if (userKey !== homeCtrl.client.id) { + if (!_.has(homeCtrl.cachedUsers, userKey)) { + UserService.getUser(userKey).then(user => { + homeCtrl.cachedUsers[userKey] = user; parsedUsers.push(homeCtrl.cachedUsers[userKey]); - } + }); + } else { + parsedUsers.push(homeCtrl.cachedUsers[userKey]); } - }); - } + } + }); homeCtrl.contacts = parsedUsers; }; From 29424e27d516a036381a75992b1b20a7f557c2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:34:10 -0300 Subject: [PATCH 206/237] Replace calc call for 1fr in chat__container grid definition --- webchat/components/chat/ecis-chat.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/chat/ecis-chat.css b/webchat/components/chat/ecis-chat.css index ee8a080f5..0cefd60d2 100644 --- a/webchat/components/chat/ecis-chat.css +++ b/webchat/components/chat/ecis-chat.css @@ -2,7 +2,7 @@ height: 100%; background: #EEEEEE; display: grid; - grid-template-rows: 64px calc(100% - 64px - 48px) 48px; + grid-template-rows: max-content 1fr max-content; grid-template-areas: 'header' 'body' From fe4e080530eb76a77a316b9e5cc92b5fbc53fce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:38:18 -0300 Subject: [PATCH 207/237] Add min-height to chat-input__text class --- webchat/components/chat/input/chat-input.css | 1 + 1 file changed, 1 insertion(+) diff --git a/webchat/components/chat/input/chat-input.css b/webchat/components/chat/input/chat-input.css index 1f9764359..040d61af9 100644 --- a/webchat/components/chat/input/chat-input.css +++ b/webchat/components/chat/input/chat-input.css @@ -15,6 +15,7 @@ height: 70%; margin: 0 0 0 10px; background: #FFFFFF; + min-height: 36px; } .chat-input__text:disabled { From ec624d02d9c722890c1acd04ff80d564ae334eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 10:46:07 -0300 Subject: [PATCH 208/237] Add sendMessage on enter pressed --- webchat/components/chat/input/chat-input.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/input/chat-input.html b/webchat/components/chat/input/chat-input.html index d62da383d..e6f7877e7 100644 --- a/webchat/components/chat/input/chat-input.html +++ b/webchat/components/chat/input/chat-input.html @@ -4,7 +4,8 @@ class="chat-input__connection-state">⬤

    + ng-model="chatInputCtrl.msg" + ng-keydown="$event.keyCode === 13 && chatInputCtrl.sendMessage()"/> Date: Fri, 8 Mar 2019 10:57:42 -0300 Subject: [PATCH 209/237] Add autoclose sidenav when a chat is open and is on mobile --- webchat/home/homeController.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 4de3f6d31..43a3d92d5 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -3,7 +3,8 @@ const webchat = angular.module('webchat'); - webchat.controller('HomeController', ['UserService', 'AuthService', 'MessageService', '$scope', function HomeController (UserService, AuthService, MessageService, $scope) { + webchat.controller('HomeController', ['UserService', 'AuthService', 'MessageService', '$scope', 'NavbarManagementService', + function HomeController (UserService, AuthService, MessageService, $scope, NavbarManagementService) { const homeCtrl = this; homeCtrl.$onInit = () => { @@ -36,6 +37,9 @@ homeCtrl.openChat = (user) => { homeCtrl.currentUser = user; + if (Utils.isMobileScreen()) { + NavbarManagementService.toggleSidenav('left'); + } }; homeCtrl.chatCreated = (e) => { From 5f288d380bfef9686b64034bb0c7c0a8cfef07e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 12:33:55 -0300 Subject: [PATCH 210/237] Add disabled input when state is not connected --- webchat/components/chat/input/chat-input.component.js | 5 +++++ webchat/components/chat/input/chat-input.html | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/webchat/components/chat/input/chat-input.component.js b/webchat/components/chat/input/chat-input.component.js index 768511a44..c7e90699a 100644 --- a/webchat/components/chat/input/chat-input.component.js +++ b/webchat/components/chat/input/chat-input.component.js @@ -34,6 +34,11 @@ chatInputCtrl.msg = ''; } }; + + chatInputCtrl.inputDisabled = () => { + return !_.includes(['connected', 'complete'], chatInputCtrl.state); + }; + } })(); \ No newline at end of file diff --git a/webchat/components/chat/input/chat-input.html b/webchat/components/chat/input/chat-input.html index e6f7877e7..45660ddb2 100644 --- a/webchat/components/chat/input/chat-input.html +++ b/webchat/components/chat/input/chat-input.html @@ -5,11 +5,13 @@ + ng-keydown="$event.keyCode === 13 && chatInputCtrl.sendMessage()" + ng-disabled="chatInputCtrl.inputDisabled()"/> + action="chatInputCtrl.sendMessage" + disabled="chatInputCtrl.inputDisabled()">
    From 6c9f81344d45793fccf483c2c64eb00f52065f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Mar 2019 20:31:06 -0300 Subject: [PATCH 211/237] Fix typo on state definition --- webchat/components/chat/input/chat-input.component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webchat/components/chat/input/chat-input.component.js b/webchat/components/chat/input/chat-input.component.js index c7e90699a..b365ac7b8 100644 --- a/webchat/components/chat/input/chat-input.component.js +++ b/webchat/components/chat/input/chat-input.component.js @@ -18,7 +18,7 @@ chatInputCtrl.getStateStyle = () => { const state = chatInputCtrl.getState(); - if (_.includes(['connected', 'complete'], state)) { + if (_.includes(['connected', 'completed'], state)) { return 'lawngreen'; } else if (_.includes(['failed', 'disconnected', 'closed'], state)) { return 'red'; @@ -36,7 +36,7 @@ }; chatInputCtrl.inputDisabled = () => { - return !_.includes(['connected', 'complete'], chatInputCtrl.state); + return !_.includes(['connected', 'completed'], chatInputCtrl.state); }; } From a2c75dada081cdf22777cf77eb67b7c48b4ccb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Mar 2019 20:31:34 -0300 Subject: [PATCH 212/237] Add structure to add video on webchat --- webchat/home/homeController.js | 57 +++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 43a3d92d5..b4b1c08c7 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -43,13 +43,23 @@ }; homeCtrl.chatCreated = (e) => { - UserService.getUser(e.id).then(user => { - homeCtrl.currentChat = e.chat; - homeCtrl.currentUser = user; - homeCtrl.currentChat.on('ice-connection-changed', homeCtrl.stateChange); - homeCtrl.currentChat.on('msg-list-updated', list => { - $scope.$apply(); - }); + homeCtrl.currentUser = homeCtrl.getUser(e.id); + homeCtrl.currentChat = e.chat; + + const selfie = document.getElementById('video-selfie'); + selfie.srcObject = homeCtrl.currentChat.selfStream; + selfie.play().then().catch(e => console.log('cant play video: ', e)); + + homeCtrl.currentChat.on('ice-connection-changed', homeCtrl.stateChange); + homeCtrl.currentChat.on('msg-list-updated', list => { + $scope.$apply(); + }); + + homeCtrl.currentChat.on('track-received', ev => { + const el = document.getElementById('video-remote'); + el.srcObject = ev.streams[0]; + el.play().then().catch(e => console.log('cant play video: ', e)); + $scope.$apply(); }); }; @@ -59,18 +69,35 @@ }; homeCtrl.call = (user) => { - homeCtrl.client.requestCall(user.key); - homeCtrl.openChat(user); + getMedia().then(stream => { + homeCtrl.client.requestCall(user.key, stream); + }); }; homeCtrl.promptCall = (id) => { - UserService.getUser(id).then(user => { - MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { - if (answer) { - homeCtrl.client.acceptCall(id); - } - }); + const user = homeCtrl.getUser(id); + + MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { + if (answer) { + homeCtrl.openChat(user); + getMedia().then(stream => { + homeCtrl.client.acceptCall(id, stream); + }); + } + }); + }; + + function getMedia() { + return new Promise((resolve, reject) => { + let stream; + navigator.mediaDevices.getUserMedia({ video: true, audio: true }).then(s => { + stream = s; + }).catch(e => console.log(e)).finally(() => resolve(stream)); }); + } + + homeCtrl.getUser = (id) => { + return homeCtrl.cachedUsers[id]; }; }]); })(); From 08411a5cd52f058207b66da42bb910d422ea3592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Mar 2019 11:24:05 -0300 Subject: [PATCH 213/237] Modify toggle button to have a specific function to call when on and off --- .../toggle-button/toggle-button.component.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index 94c0874d4..50ce06ece 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -28,7 +28,8 @@ iconOff: '@', iconColorOn: '@', iconColorOff: '@', - action: '<', + actionOn: '<', + actionOff: '<', }, }); @@ -40,13 +41,14 @@ active: true, iconColorOn: "#EEE", iconColorOff: "#EEE", - action: () => {} + actionOn: () => {}, + actionOff: () => {}, }); }; toggleButtonCtrl.toggle = () => { toggleButtonCtrl.active = !toggleButtonCtrl.active; - toggleButtonCtrl.action(); + toggleButtonCtrl.activeActionFunc(); }; Object.defineProperty(toggleButtonCtrl, 'activeIcon', { @@ -60,6 +62,12 @@ return toggleButtonCtrl.active ? toggleButtonCtrl.iconColorOn : toggleButtonCtrl.iconColorOff; }, }); + + Object.defineProperty(toggleButtonCtrl, 'activeActionFunc', { + get: () => { + return toggleButtonCtrl.active ? toggleButtonCtrl.actionOn : toggleButtonCtrl.actionOff; + }, + }); } })(); \ No newline at end of file From 5d509d170999eadc6cc93c38049bcafc52723bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Mar 2019 11:24:51 -0300 Subject: [PATCH 214/237] Add video and audio toggle buttons on chat --- webchat/components/chat/buttons/chat-buttons.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/buttons/chat-buttons.html b/webchat/components/chat/buttons/chat-buttons.html index 7240fd019..8a5541348 100644 --- a/webchat/components/chat/buttons/chat-buttons.html +++ b/webchat/components/chat/buttons/chat-buttons.html @@ -1 +1,11 @@ - \ No newline at end of file + + + From 88e6ae0fec6a1418f179163c1f711ef0d5770a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Mar 2019 11:26:31 -0300 Subject: [PATCH 215/237] Fix navbar shown when accept call --- webchat/home/homeController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index b4b1c08c7..6cd162341 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -79,7 +79,7 @@ MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { if (answer) { - homeCtrl.openChat(user); + homeCtrl.currentUser = user; getMedia().then(stream => { homeCtrl.client.acceptCall(id, stream); }); From 382be66cacad3d0395c5c73dc088b07539b61f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 13 Mar 2019 11:28:40 -0300 Subject: [PATCH 216/237] Add video tags on chat body --- webchat/components/chat/body/chat-body.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index 48bd48557..9d87fec32 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -4,4 +4,8 @@ ng-repeat="message in chatBodyCtrl.messages" message-obj="message"> -
    \ No newline at end of file +
    +
    + + +
    From d5231988a77792691172d1b3a6fb2d637030c34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 14 Mar 2019 09:10:55 -0300 Subject: [PATCH 217/237] Add videoStream passed as a binding to chat body --- .../chat/body/chat-body.component.js | 24 +++++++++++++++++++ .../components/chat/ecis-chat.component.js | 2 ++ webchat/components/chat/ecis-chat.html | 4 +++- webchat/home/home.html | 4 +++- webchat/home/homeController.js | 9 ++----- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/webchat/components/chat/body/chat-body.component.js b/webchat/components/chat/body/chat-body.component.js index cc3c4f4bc..de7334f6d 100644 --- a/webchat/components/chat/body/chat-body.component.js +++ b/webchat/components/chat/body/chat-body.component.js @@ -7,11 +7,35 @@ controllerAs: "chatBodyCtrl", bindings: { messages: '<', + videoActive: '<', + selfieStream: '<', + remoteStream: '<', }, }); function chatBodyController() { const chatBodyCtrl = this; + + chatBodyCtrl.$onChanges = (changesObj) => { + updateSelfieVideo(changesObj); + updateRemoteVideo(changesObj); + }; + + const updateSelfieVideo = (changesObj) => { + if (_.has(changesObj, 'selfieStream.currentValue')) { + const selfieVideo = document.getElementById('video-selfie'); + selfieVideo.srcObject = chatBodyCtrl.selfieStream; + selfieVideo.play(); + } + }; + + const updateRemoteVideo = (changesObj) => { + if (_.has(changesObj, 'remoteStream.currentValue')) { + const remoteVideo = document.getElementById('video-remote'); + remoteVideo.srcObject = chatBodyCtrl.remoteStream; + remoteVideo.play(); + } + }; } })(); \ No newline at end of file diff --git a/webchat/components/chat/ecis-chat.component.js b/webchat/components/chat/ecis-chat.component.js index a80eb9cab..a9b7d0958 100644 --- a/webchat/components/chat/ecis-chat.component.js +++ b/webchat/components/chat/ecis-chat.component.js @@ -10,6 +10,8 @@ user: '<', callFunc: '<', state: '<', + selfieStream: '<', + remoteStream: '<', }, }); diff --git a/webchat/components/chat/ecis-chat.html b/webchat/components/chat/ecis-chat.html index b46d04748..1bcff6d70 100644 --- a/webchat/components/chat/ecis-chat.html +++ b/webchat/components/chat/ecis-chat.html @@ -6,7 +6,9 @@ + messages="ecisChatCtrl.chat.currentMessages" + selfie-stream="ecisChatCtrl.selfieStream" + remote-stream="ecisChatCtrl.remoteStream"> + state="homeCtrl.state" + selfie-stream="homeCtrl.selfieStream" + remote-stream="homeCtrl.remoteStream">
    diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 6cd162341..f683db4e8 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -46,9 +46,7 @@ homeCtrl.currentUser = homeCtrl.getUser(e.id); homeCtrl.currentChat = e.chat; - const selfie = document.getElementById('video-selfie'); - selfie.srcObject = homeCtrl.currentChat.selfStream; - selfie.play().then().catch(e => console.log('cant play video: ', e)); + homeCtrl.selfieStream = homeCtrl.currentChat.selfStream; homeCtrl.currentChat.on('ice-connection-changed', homeCtrl.stateChange); homeCtrl.currentChat.on('msg-list-updated', list => { @@ -56,10 +54,7 @@ }); homeCtrl.currentChat.on('track-received', ev => { - const el = document.getElementById('video-remote'); - el.srcObject = ev.streams[0]; - el.play().then().catch(e => console.log('cant play video: ', e)); - $scope.$apply(); + homeCtrl.remoteStream = ev.streams[0]; }); }; From 1a6a75882acf1985cde1d439d07cbd31cecdc056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 14 Mar 2019 13:08:35 -0300 Subject: [PATCH 218/237] Add specific height an width to video --- webchat/components/chat/body/chat-body.css | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index 161d82c13..98db2bf5b 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -1,4 +1,9 @@ -.chat-body__container { +.chat-body { + height: 100%; + width: 100%; +} + +.chat-body__messages-container { height: 100%; max-height: 100%; display: flex; @@ -6,3 +11,24 @@ overflow-y: scroll; justify-content: flex-end; } + +.chat-body__video-container { + background-color: darkgray; + max-width: 100%; + max-height: 100%; + height: 100%; + width: 100%; +} + +#video-remote { + height: 100%; + width: 100%; + max-width: 100%; + max-height: 100%; +} + +#video-selfie { + display: none; + max-width: 100%; + max-height: 100%; +} \ No newline at end of file From 21fccf4f6f2917259a097f06c52c8137656d1afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 14 Mar 2019 13:09:12 -0300 Subject: [PATCH 219/237] Add video toggle --- webchat/components/chat/body/chat-body.html | 4 ++-- .../chat/buttons/chat-buttons.component.js | 2 ++ webchat/components/chat/buttons/chat-buttons.html | 4 ++-- webchat/components/chat/ecis-chat.component.js | 11 +++++++++++ webchat/components/chat/ecis-chat.html | 5 ++++- .../components/chat/header/chat-header.component.js | 3 +++ webchat/components/chat/header/chat-header.html | 5 ++++- .../toggle-button/toggle-button.component.js | 2 +- webchat/home/homeController.js | 12 ++++++++---- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index 9d87fec32..b1a63ce13 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -1,11 +1,11 @@ -
    +
    -
    +
    diff --git a/webchat/components/chat/buttons/chat-buttons.component.js b/webchat/components/chat/buttons/chat-buttons.component.js index 08bf5d7ea..fa9bd908b 100644 --- a/webchat/components/chat/buttons/chat-buttons.component.js +++ b/webchat/components/chat/buttons/chat-buttons.component.js @@ -7,6 +7,8 @@ controllerAs: "chatButtonsCtrl", bindings: { callFunc: "<", + enableVideoFunc: "<", + disableVideoFunc: "<", }, }); diff --git a/webchat/components/chat/buttons/chat-buttons.html b/webchat/components/chat/buttons/chat-buttons.html index 8a5541348..4aef7cd55 100644 --- a/webchat/components/chat/buttons/chat-buttons.html +++ b/webchat/components/chat/buttons/chat-buttons.html @@ -1,8 +1,8 @@ + action-on="chatButtonsCtrl.enableVideoFunc" + action-off="chatButtonsCtrl.disableVideoFunc"> { ecisChatCtrl.callFunc(ecisChatCtrl.user); }; + + ecisChatCtrl.disableVideo = () => { + ecisChatCtrl.videoActive = false; + console.log('disabled'); + }; + + ecisChatCtrl.enableVideo = () => { + ecisChatCtrl.videoActive = true; + console.log('enabled'); + }; + } })(); \ No newline at end of file diff --git a/webchat/components/chat/ecis-chat.html b/webchat/components/chat/ecis-chat.html index 1bcff6d70..153b534ba 100644 --- a/webchat/components/chat/ecis-chat.html +++ b/webchat/components/chat/ecis-chat.html @@ -2,11 +2,14 @@ + call-func="ecisChatCtrl.call" + enable-video-func="ecisChatCtrl.enableVideo" + disable-video-func="ecisChatCtrl.disableVideo"> diff --git a/webchat/components/chat/header/chat-header.component.js b/webchat/components/chat/header/chat-header.component.js index f8949a503..32fe45182 100644 --- a/webchat/components/chat/header/chat-header.component.js +++ b/webchat/components/chat/header/chat-header.component.js @@ -9,11 +9,14 @@ user: "<", chat: "<", callFunc: "<", + enableVideoFunc: '<', + disableVideoFunc: '<', }, }); function chatHeaderController() { const chatHeaderCtrl = this; + } })(); \ No newline at end of file diff --git a/webchat/components/chat/header/chat-header.html b/webchat/components/chat/header/chat-header.html index c357f885f..1e11de890 100644 --- a/webchat/components/chat/header/chat-header.html +++ b/webchat/components/chat/header/chat-header.html @@ -4,5 +4,8 @@ avatar="{{ chatHeaderCtrl.user.photo_url }}" name="{{ chatHeaderCtrl.user.name }}" text="{{ chatHeaderCtrl.user.email[0] }}"> - +
    diff --git a/webchat/components/toggle-button/toggle-button.component.js b/webchat/components/toggle-button/toggle-button.component.js index 50ce06ece..ce965cdc6 100644 --- a/webchat/components/toggle-button/toggle-button.component.js +++ b/webchat/components/toggle-button/toggle-button.component.js @@ -47,8 +47,8 @@ }; toggleButtonCtrl.toggle = () => { - toggleButtonCtrl.active = !toggleButtonCtrl.active; toggleButtonCtrl.activeActionFunc(); + toggleButtonCtrl.active = !toggleButtonCtrl.active; }; Object.defineProperty(toggleButtonCtrl, 'activeIcon', { diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index f683db4e8..f22e830ca 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -74,14 +74,18 @@ MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { if (answer) { - homeCtrl.currentUser = user; - getMedia().then(stream => { - homeCtrl.client.acceptCall(id, stream); - }); + homeCtrl.acceptCall(user, id); } }); }; + homeCtrl.acceptCall = (user, id) => { + homeCtrl.currentUser = user; + getMedia().then(stream => { + homeCtrl.client.acceptCall(id, stream); + }); + }; + function getMedia() { return new Promise((resolve, reject) => { let stream; From 4a41716a12e00949c51d3c45d343990fed1a1f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 13:28:56 -0300 Subject: [PATCH 220/237] Apply responsability to contain remote stream to chat --- .../components/chat/body/chat-body.component.js | 12 ++++++++---- webchat/components/chat/ecis-chat.component.js | 2 -- webchat/home/home.html | 4 ++-- webchat/home/homeController.js | 15 ++++----------- webchat/utils/chat.js | 8 +++++++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/webchat/components/chat/body/chat-body.component.js b/webchat/components/chat/body/chat-body.component.js index de7334f6d..fda116370 100644 --- a/webchat/components/chat/body/chat-body.component.js +++ b/webchat/components/chat/body/chat-body.component.js @@ -22,17 +22,21 @@ }; const updateSelfieVideo = (changesObj) => { - if (_.has(changesObj, 'selfieStream.currentValue')) { + const canUpdate = _.get(changesObj, 'selfieStream.currentValue.active', false); + + if (canUpdate) { const selfieVideo = document.getElementById('video-selfie'); - selfieVideo.srcObject = chatBodyCtrl.selfieStream; + selfieVideo.srcObject = changesObj.selfieStream.currentValue; selfieVideo.play(); } }; const updateRemoteVideo = (changesObj) => { - if (_.has(changesObj, 'remoteStream.currentValue')) { + const canUpdate = _.get(changesObj, 'remoteStream.currentValue.active', false); + + if (canUpdate) { const remoteVideo = document.getElementById('video-remote'); - remoteVideo.srcObject = chatBodyCtrl.remoteStream; + remoteVideo.srcObject = changesObj.remoteStream.currentValue; remoteVideo.play(); } }; diff --git a/webchat/components/chat/ecis-chat.component.js b/webchat/components/chat/ecis-chat.component.js index 6dfcb06da..19c137352 100644 --- a/webchat/components/chat/ecis-chat.component.js +++ b/webchat/components/chat/ecis-chat.component.js @@ -28,12 +28,10 @@ ecisChatCtrl.disableVideo = () => { ecisChatCtrl.videoActive = false; - console.log('disabled'); }; ecisChatCtrl.enableVideo = () => { ecisChatCtrl.videoActive = true; - console.log('enabled'); }; } diff --git a/webchat/home/home.html b/webchat/home/home.html index b1a40114f..8a81faeb5 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -7,7 +7,7 @@ user="homeCtrl.currentUser" call-func="homeCtrl.call" state="homeCtrl.state" - selfie-stream="homeCtrl.selfieStream" - remote-stream="homeCtrl.remoteStream"> + selfie-stream="homeCtrl.currentChat.selfieStream" + remote-stream="homeCtrl.currentChat.remoteStream">
    diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index f22e830ca..ff23092fe 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -37,25 +37,18 @@ homeCtrl.openChat = (user) => { homeCtrl.currentUser = user; - if (Utils.isMobileScreen()) { - NavbarManagementService.toggleSidenav('left'); - } + homeCtrl.currentChat = homeCtrl.client.chats[user.key] || {}; + }; homeCtrl.chatCreated = (e) => { - homeCtrl.currentUser = homeCtrl.getUser(e.id); - homeCtrl.currentChat = e.chat; - - homeCtrl.selfieStream = homeCtrl.currentChat.selfStream; + homeCtrl.openChat(homeCtrl.getUser(e.id)); homeCtrl.currentChat.on('ice-connection-changed', homeCtrl.stateChange); homeCtrl.currentChat.on('msg-list-updated', list => { $scope.$apply(); }); - homeCtrl.currentChat.on('track-received', ev => { - homeCtrl.remoteStream = ev.streams[0]; - }); }; homeCtrl.stateChange = (state) => { @@ -80,7 +73,7 @@ }; homeCtrl.acceptCall = (user, id) => { - homeCtrl.currentUser = user; + homeCtrl.openChat(user); getMedia().then(stream => { homeCtrl.client.acceptCall(id, stream); }); diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index ffd48d558..cc210f8d0 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -25,10 +25,15 @@ this.rpc.onicecandidate = e => this.emit('ice-candidate-discovered', e); this.sendChannel = this.rpc.createDataChannel('sendChannel'); this.rpc.ondatachannel = this.handleDataChannel.bind(this); - this.rpc.ontrack = e => this.emit('track-received', e); + this.rpc.ontrack = this.handleTrack.bind(this); this.rpc.oniceconnectionstatechange = this.handleIceConnectionState.bind(this); this.rpc.onsignalingstatechange = this.handleState.bind(this); this._currentMessages = []; + this._remoteStream = {}; + } + + get remoteStream() { + return this._remoteStream; } get selfStream() { @@ -171,6 +176,7 @@ * @param {Event} e - event which contains the stream object and its tracks. */ handleTrack(e) { + this._remoteStream = e.streams[0]; this.emit('track-received', e); } From 6fa2345fc5c7af5c963291254e276e4ca449f74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 15:06:56 -0300 Subject: [PATCH 221/237] Fix dialog confirm action not triggering --- webchat/home/homeController.js | 8 +++--- webchat/index.html | 2 +- webchat/styles/custom/custom.css | 5 ++++ webchat/utils/confirm_dialog.css | 29 ++++++++++++++++++++++ webchat/utils/confirm_dialog.html | 15 +++++++++++ webchat/utils/messageService.js | 41 +++++++++++++++++++++++-------- 6 files changed, 85 insertions(+), 15 deletions(-) create mode 100644 webchat/utils/confirm_dialog.css create mode 100644 webchat/utils/confirm_dialog.html diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index ff23092fe..7bcff2c8c 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -65,10 +65,10 @@ homeCtrl.promptCall = (id) => { const user = homeCtrl.getUser(id); - MessageService.showConfirmationDialog({}, "Ligação recebida", `Ligação de ${user.name}. Aceitar?`).then(answer => { - if (answer) { - homeCtrl.acceptCall(user, id); - } + MessageService.showConfirmationDialog({}, { + title: user.name, + subtitle: "Está te ligando você deseja atender essa ligação?", + confirmAction: () => homeCtrl.acceptCall(user, id), }); }; diff --git a/webchat/index.html b/webchat/index.html index 4718ee2a2..26d4db6f5 100644 --- a/webchat/index.html +++ b/webchat/index.html @@ -66,7 +66,7 @@ - + diff --git a/webchat/styles/custom/custom.css b/webchat/styles/custom/custom.css index 4da3533e0..3978a6af5 100644 --- a/webchat/styles/custom/custom.css +++ b/webchat/styles/custom/custom.css @@ -5,4 +5,9 @@ background-color: #EEEEEE; border: none; outline: none; +} + +.custom-title { + font-size: 20px; + font-weight: 500; } \ No newline at end of file diff --git a/webchat/utils/confirm_dialog.css b/webchat/utils/confirm_dialog.css new file mode 100644 index 000000000..0ced2c801 --- /dev/null +++ b/webchat/utils/confirm_dialog.css @@ -0,0 +1,29 @@ +.dialog__container { + display: grid; + grid-template-areas: + "title" + "subtitle" + "buttons"; + padding: 1.5em 2em 0; +} + +.dialog__title { + grid-area: title; + margin: 0; +} + +.dialog__subtitle { + grid-area: subtitle; + padding: 0.5em 0; +} + +.dialog__buttons { + grid-area: buttons; + display: flex; + flex-direction: row; + justify-content: flex-end; +} + +.dialog__button { + margin: 1em 0; +} \ No newline at end of file diff --git a/webchat/utils/confirm_dialog.html b/webchat/utils/confirm_dialog.html new file mode 100644 index 000000000..840422bff --- /dev/null +++ b/webchat/utils/confirm_dialog.html @@ -0,0 +1,15 @@ + + + {{ dialogCtrl.title }} + {{ dialogCtrl.subtitle }} + +
    + + {{ dialogCtrl.cancelText }} + + + {{ dialogCtrl.confirmText }} + +
    +     +     diff --git a/webchat/utils/messageService.js b/webchat/utils/messageService.js index 001b710e2..ab0df3f6a 100644 --- a/webchat/utils/messageService.js +++ b/webchat/utils/messageService.js @@ -28,19 +28,40 @@ return (message && msg[message.code]) || msg[message] || message; } - service.showConfirmationDialog = function showConfirmationDialog(event, title, textContent) { - const confirm = $mdDialog.confirm() - .clickOutsideToClose(true) - .title(title) - .textContent(textContent) - .ariaLabel(title) - .targetEvent(event) - .ok('Ok') - .cancel('Cancelar'); + service.showConfirmationDialog = function showConfirmationDialog(event, params) { + const dialog = { + templateUrl: "app/utils/confirm_dialog.html", + controller: dialogController, + controllerAs: 'dialogCtrl', + parent: angular.element(document.body), + targetEvent: event, + clickOutsideToClose:true, + locals: params, + }; - return $mdDialog.show(confirm); + return $mdDialog.show(dialog); }; + function dialogController (locals) { + const dialogCtrl = this; + + dialogCtrl.$onInit = () => { + _.assign(dialogCtrl, locals); + _.defaults(dialogCtrl, { + confirmAction: () => {}, + cancelText: "Cancelar", + confirmText: "Confirmar", + }); + }; + + dialogCtrl.cancelDialog = $mdDialog.cancel; + + dialogCtrl.confirmDialog = () => { + dialogCtrl.confirmAction(); + $mdDialog.hide(); + }; + } + service.showMessageDialog = function (event, message) { function MessageController ($mdDialog) { From 2a730505cb5be35b59774ff56e948ad641543ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 16:35:34 -0300 Subject: [PATCH 222/237] Fix message shown when there is no contacts online --- webchat/components/contacts/list/contacts-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/contacts/list/contacts-list.html b/webchat/components/contacts/list/contacts-list.html index 5355da2eb..07426aba9 100644 --- a/webchat/components/contacts/list/contacts-list.html +++ b/webchat/components/contacts/list/contacts-list.html @@ -12,5 +12,5 @@ -

    Não há contatos online no momento.

    +

    Não há contatos online no momento.

    \ No newline at end of file From 59f6457e5956aefce92952b7099bc7c748ffb5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 16:46:33 -0300 Subject: [PATCH 223/237] Add is-empty-card component and message when no chat is selected --- webchat/home/home.html | 1 + webchat/images/desenho-cis.png | Bin 0 -> 63421 bytes webchat/index.html | 6 +++- .../is-empty-card/is-empty-card.component.js | 24 ++++++++++++++++ webchat/utils/is-empty-card/is-empty-card.css | 26 ++++++++++++++++++ .../utils/is-empty-card/is-empty-card.html | 4 +++ 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 webchat/images/desenho-cis.png create mode 100644 webchat/utils/is-empty-card/is-empty-card.component.js create mode 100644 webchat/utils/is-empty-card/is-empty-card.css create mode 100644 webchat/utils/is-empty-card/is-empty-card.html diff --git a/webchat/home/home.html b/webchat/home/home.html index 8a81faeb5..3e4a418f3 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -10,4 +10,5 @@ selfie-stream="homeCtrl.currentChat.selfieStream" remote-stream="homeCtrl.currentChat.remoteStream"> +
    diff --git a/webchat/images/desenho-cis.png b/webchat/images/desenho-cis.png new file mode 100644 index 0000000000000000000000000000000000000000..958e63f9af8086e54aa65a10f12bd9f7096ec219 GIT binary patch literal 63421 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ðH}L1VzUQy;6)k^Pk0&egSdQi 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

    $BSsDqaeXu_!bA-xbqX*)o4` z2eGFeAY~rGd!7fO6z0?g?X~!r4_F+k=9C2BI@-EISI&Z^_Jy>AMctXz8$z>ZVY!+h z^uvhsSp@&&F%AIz+zO8vpqLIThN{zMgRz@|P@SOoMD0mt5RG8H5NIvE@~$Nvz`31@ zfL~CM3*3Oz;U`or6Fx)W2yZ!;b)wel2>p2oiziBv znr{Jg1XI<5!hXV1*P~zO3sQw^!G;!)azddKR!R?w$^S1XlG~tG6zhiFk@AZ3zTrn# zXamosAzq=nD;FBqtPJG0z5`}E^1>P82cdaipHDB*9u+ICvEL^>4WQ5U+?dIG1{nWs zU!w;kGC;#|{=As$aV>CM&FpV;G`yeWdlJN0Sp6*kY3zXu88s)9W7{yAqHmc?`G)_Z zJMA>xDIn#zZ~BCeo>V0vNhkB*n)XmAo_30|VEc0b&dd1~ckH|GBM3;$(l_&d)LUp( zRB_O=)qqa}K`QOk)A1eydrA~{oN$FJI4=n#$Ya~c`b5-5uQDCrjJ$v*1!1enJmAX$ z>s#*tP6#ad6)otqoG|0_SS{%PD-w_*7v9P)l{&+MPu8G+hFre`9C0q-MV&M-#mQ(% zNZOxiP?#JAOI=*JG>{yAl`a$KF%=+_^h@!#rfU1iGWAMK^pEGDXVs`4Vd9WpCM5%- zzGNvGGRR@69Y}|^Fd`mWJd4?Qb{eSXc7V&d-+?nJE=AYUWeC>=!z4tyvEiYtxbELt zX9q}b*Q*qvkq}quUj?T}R2utKdX4-!d*;kdu-`C|M20jkumsA`hwlOvGbC%ucn9RF zB;-{@JtxVR|A!XST_B~cFrst&X-1Xt*qzgv^L~JpFK-~pb3kior3t;i{O;q+C;A6^ zBrfbGg@~4ly92&Vc@UEhI3UeRRz?JV+0U%@t@ACGL6c_*)^K|2sdP`SGh`mk! z^A33Yg4*RSXfqM@r(vAoUHOaQxOMgnDsR#mLX`wsQB z#?ph^c<#|kN`yqi?&e4bIKbgi#MM^g&$e&M!ihWP^tp)A=aO>y>yi{D4iH~o^_jq- zroqq{(D+YwsIB$+f$?m%)&H_YAUwL$ByzT@FXVki4r#KvTt8D-!|M?QmJE3fqAkfb zb&?yw9j1kmZcj{5w0CqlJcJCh1T=e-z+zv(4jEi{`IqMqi>(mcOvG?;!UGuWUoW|cesM=c4J0%jYbq)mDKp#j&A#xUXvvv6O zF+vCKnkCt-(2YX>Z9~Z15D%5w8x$^=l(*N+Z>IA??<}K#?p&wsP2dKg>0yWuXMaDX za6}U53HbAIDBvJ)mJ(aSb`LgRgZRn&_(9dge1-fOmZDJLjvS-`WF(#gqx*cSRg@s? t)))SIo;hDTs2_a$|L=b-+xv%3!-RRiA6DpRKM9TXrsiFZ5;dEb{{v - + + + @@ -150,6 +152,8 @@ + + diff --git a/webchat/utils/is-empty-card/is-empty-card.component.js b/webchat/utils/is-empty-card/is-empty-card.component.js new file mode 100644 index 000000000..2bbed5714 --- /dev/null +++ b/webchat/utils/is-empty-card/is-empty-card.component.js @@ -0,0 +1,24 @@ +(function () { + 'use strict'; + + /** + * Component that is shown when something is empty and in the error page. + * It's shows a default image and a text that it receives as a binding. + * @class isEmptyCard + * @example + * + */ + angular.module("webchat").component("isEmptyCard", { + templateUrl: "app/utils/is-empty-card/is-empty-card.html", + controller: isEmptyCardController, + controllerAs: "isEmptyCardCtrl", + bindings: { + text: "@" + }, + }); + + function isEmptyCardController() { + + } + +})(); \ No newline at end of file diff --git a/webchat/utils/is-empty-card/is-empty-card.css b/webchat/utils/is-empty-card/is-empty-card.css new file mode 100644 index 000000000..e211f97f9 --- /dev/null +++ b/webchat/utils/is-empty-card/is-empty-card.css @@ -0,0 +1,26 @@ +.is-empty-card__container { + display: grid; + grid-template-rows: auto auto; + grid-template-areas: + 'image' + 'text'; + width: 100%; + height: 100%; +} + +.is-empty-card__image { + grid-area: image; + width: 100%; +} + +.is-empty-card__text { + grid-area: text; + display: flex; + font-size: 1.5em; + margin: 1em 0; + padding: 0 0.5em; + font-weight: bold; + color: #009688; + text-align: center; + justify-content: center; +} \ No newline at end of file diff --git a/webchat/utils/is-empty-card/is-empty-card.html b/webchat/utils/is-empty-card/is-empty-card.html new file mode 100644 index 000000000..65a66249b --- /dev/null +++ b/webchat/utils/is-empty-card/is-empty-card.html @@ -0,0 +1,4 @@ +

    + + {{ isEmptyCardCtrl.text }} +
    \ No newline at end of file From 8bbbbadd5a74763dbd029b31722090eee98e9abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 17:07:05 -0300 Subject: [PATCH 224/237] Add secure chat info message --- webchat/components/chat/body/chat-body.css | 9 +++++++++ webchat/components/chat/body/chat-body.html | 1 + 2 files changed, 10 insertions(+) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index 98db2bf5b..f7b5c4ca9 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -20,6 +20,15 @@ width: 100%; } +.chat-body__info-message { + background-color: lightgoldenrodyellow; + width: fit-content; + padding: 10px 20px; + border-radius: 10px; + align-self: center; + margin: 10px 0 auto 0; +} + #video-remote { height: 100%; width: 100%; diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index b1a63ce13..1a0d50a47 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -1,4 +1,5 @@
    + Esta é uma conversa segura e não esta sendo gravada Date: Fri, 15 Mar 2019 17:18:16 -0300 Subject: [PATCH 225/237] Fix is-empty-card component size --- webchat/utils/is-empty-card/is-empty-card.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webchat/utils/is-empty-card/is-empty-card.css b/webchat/utils/is-empty-card/is-empty-card.css index e211f97f9..194314844 100644 --- a/webchat/utils/is-empty-card/is-empty-card.css +++ b/webchat/utils/is-empty-card/is-empty-card.css @@ -1,16 +1,19 @@ .is-empty-card__container { display: grid; - grid-template-rows: auto auto; + grid-template-rows: 1fr 1fr; grid-template-areas: 'image' 'text'; width: 100%; height: 100%; + justify-content: center; } .is-empty-card__image { grid-area: image; - width: 100%; + max-height: 100%; + max-width: 100%; + align-self: flex-end; } .is-empty-card__text { From bf5ba8e35b393b4dddf2b4156a6a421ce1be2f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 17:20:48 -0300 Subject: [PATCH 226/237] Fix info message size --- webchat/components/chat/body/chat-body.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index f7b5c4ca9..7528d3c00 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -21,12 +21,13 @@ } .chat-body__info-message { + text-align: center; background-color: lightgoldenrodyellow; width: fit-content; padding: 10px 20px; border-radius: 10px; align-self: center; - margin: 10px 0 auto 0; + margin: 10px 10px auto; } #video-remote { From 85227823d395ac21745dce6ca3a5e1ed9d993bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 17:32:03 -0300 Subject: [PATCH 227/237] Fix video responsive size --- webchat/components/chat/ecis-chat.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/chat/ecis-chat.css b/webchat/components/chat/ecis-chat.css index 0cefd60d2..05d185115 100644 --- a/webchat/components/chat/ecis-chat.css +++ b/webchat/components/chat/ecis-chat.css @@ -2,7 +2,7 @@ height: 100%; background: #EEEEEE; display: grid; - grid-template-rows: max-content 1fr max-content; + grid-template-rows: 64px calc(100% - 64px - 50px) 50px; grid-template-areas: 'header' 'body' From 98925143440b8a13889b129155cb8767a25e2232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 17:33:08 -0300 Subject: [PATCH 228/237] Fix is-empty-card allign --- webchat/utils/is-empty-card/is-empty-card.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/utils/is-empty-card/is-empty-card.css b/webchat/utils/is-empty-card/is-empty-card.css index 194314844..d7371b428 100644 --- a/webchat/utils/is-empty-card/is-empty-card.css +++ b/webchat/utils/is-empty-card/is-empty-card.css @@ -6,7 +6,7 @@ 'text'; width: 100%; height: 100%; - justify-content: center; + justify-items: center; } .is-empty-card__image { From aa9049fdc4b788f295b2e12ae99f6c5d258c3b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 15 Mar 2019 17:53:03 -0300 Subject: [PATCH 229/237] Add audio management functions --- webchat/components/chat/body/chat-body.component.js | 11 +++++++++++ webchat/components/chat/body/chat-body.html | 2 +- .../components/chat/buttons/chat-buttons.component.js | 2 ++ webchat/components/chat/buttons/chat-buttons.html | 4 ++-- webchat/components/chat/ecis-chat.component.js | 8 ++++++++ webchat/components/chat/ecis-chat.html | 5 ++++- .../components/chat/header/chat-header.component.js | 2 ++ webchat/components/chat/header/chat-header.html | 4 +++- 8 files changed, 33 insertions(+), 5 deletions(-) diff --git a/webchat/components/chat/body/chat-body.component.js b/webchat/components/chat/body/chat-body.component.js index fda116370..f80dd9dee 100644 --- a/webchat/components/chat/body/chat-body.component.js +++ b/webchat/components/chat/body/chat-body.component.js @@ -8,6 +8,7 @@ bindings: { messages: '<', videoActive: '<', + audioActive: '<', selfieStream: '<', remoteStream: '<', }, @@ -19,6 +20,7 @@ chatBodyCtrl.$onChanges = (changesObj) => { updateSelfieVideo(changesObj); updateRemoteVideo(changesObj); + updateRemoteAudio(changesObj); }; const updateSelfieVideo = (changesObj) => { @@ -40,6 +42,15 @@ remoteVideo.play(); } }; + + const updateRemoteAudio = (changesObj) => { + const canUpdate = _.has(changesObj, 'audioActive'); + + if (canUpdate) { + const remoteVideo = document.getElementById('video-remote'); + remoteVideo.muted = changesObj.audioActive.currentValue; + } + }; } })(); \ No newline at end of file diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index 1a0d50a47..8c61a3da1 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -8,5 +8,5 @@
    - +
    diff --git a/webchat/components/chat/buttons/chat-buttons.component.js b/webchat/components/chat/buttons/chat-buttons.component.js index fa9bd908b..2c5f0a4f9 100644 --- a/webchat/components/chat/buttons/chat-buttons.component.js +++ b/webchat/components/chat/buttons/chat-buttons.component.js @@ -9,6 +9,8 @@ callFunc: "<", enableVideoFunc: "<", disableVideoFunc: "<", + enableAudioFunc: "<", + disableAudioFunc: "<", }, }); diff --git a/webchat/components/chat/buttons/chat-buttons.html b/webchat/components/chat/buttons/chat-buttons.html index 4aef7cd55..181219584 100644 --- a/webchat/components/chat/buttons/chat-buttons.html +++ b/webchat/components/chat/buttons/chat-buttons.html @@ -6,6 +6,6 @@ + action-on="chatButtonsCtrl.enableAudioFunc" + action-off="chatButtonsCtrl.disableAudioFunc"> diff --git a/webchat/components/chat/ecis-chat.component.js b/webchat/components/chat/ecis-chat.component.js index 19c137352..243ed7707 100644 --- a/webchat/components/chat/ecis-chat.component.js +++ b/webchat/components/chat/ecis-chat.component.js @@ -34,6 +34,14 @@ ecisChatCtrl.videoActive = true; }; + ecisChatCtrl.disableAudio = () => { + ecisChatCtrl.audioActive = false; + }; + + ecisChatCtrl.enableAudio = () => { + ecisChatCtrl.audioActive = true; + }; + } })(); \ No newline at end of file diff --git a/webchat/components/chat/ecis-chat.html b/webchat/components/chat/ecis-chat.html index 153b534ba..94080c253 100644 --- a/webchat/components/chat/ecis-chat.html +++ b/webchat/components/chat/ecis-chat.html @@ -4,12 +4,15 @@ user="ecisChatCtrl.user" call-func="ecisChatCtrl.call" enable-video-func="ecisChatCtrl.enableVideo" - disable-video-func="ecisChatCtrl.disableVideo"> + disable-video-func="ecisChatCtrl.disableVideo" + enable-audio-func="ecisChatCtrl.enableAudio" + disable-audio-func="ecisChatCtrl.disableAudio"> diff --git a/webchat/components/chat/header/chat-header.component.js b/webchat/components/chat/header/chat-header.component.js index 32fe45182..56c68d904 100644 --- a/webchat/components/chat/header/chat-header.component.js +++ b/webchat/components/chat/header/chat-header.component.js @@ -11,6 +11,8 @@ callFunc: "<", enableVideoFunc: '<', disableVideoFunc: '<', + enableAudioFunc: '<', + disableAudioFunc: '<', }, }); diff --git a/webchat/components/chat/header/chat-header.html b/webchat/components/chat/header/chat-header.html index 1e11de890..af0c36bb6 100644 --- a/webchat/components/chat/header/chat-header.html +++ b/webchat/components/chat/header/chat-header.html @@ -7,5 +7,7 @@ + disable-video-func="chatHeaderCtrl.disableVideoFunc" + enable-audio-func="chatHeaderCtrl.enableAudioFunc" + disable-audio-func="chatHeaderCtrl.disableAudioFunc"> From 270999d5acef6dc7fe779e41cc55223732903fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 14:50:44 -0300 Subject: [PATCH 230/237] Change info message color to match cis palette --- webchat/components/chat/body/chat-body.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index 7528d3c00..bbc6aa3ab 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -22,7 +22,8 @@ .chat-body__info-message { text-align: center; - background-color: lightgoldenrodyellow; + background-color: #009688; + color: white; width: fit-content; padding: 10px 20px; border-radius: 10px; From 5ab56a4c9d7b535c1fb8f6ee43462739179cc9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 15:44:24 -0300 Subject: [PATCH 231/237] Move state responsability to chat object --- webchat/home/home.html | 2 +- webchat/home/homeController.js | 1 - webchat/utils/chat.js | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/webchat/home/home.html b/webchat/home/home.html index 3e4a418f3..f66c74149 100644 --- a/webchat/home/home.html +++ b/webchat/home/home.html @@ -6,7 +6,7 @@ chat="homeCtrl.currentChat" user="homeCtrl.currentUser" call-func="homeCtrl.call" - state="homeCtrl.state" + state="homeCtrl.currentChat.connectionState" selfie-stream="homeCtrl.currentChat.selfieStream" remote-stream="homeCtrl.currentChat.remoteStream"> diff --git a/webchat/home/homeController.js b/webchat/home/homeController.js index 7bcff2c8c..cef4fd162 100644 --- a/webchat/home/homeController.js +++ b/webchat/home/homeController.js @@ -52,7 +52,6 @@ }; homeCtrl.stateChange = (state) => { - homeCtrl.state = state; $scope.$apply(); }; diff --git a/webchat/utils/chat.js b/webchat/utils/chat.js index cc210f8d0..fcb00ea57 100644 --- a/webchat/utils/chat.js +++ b/webchat/utils/chat.js @@ -30,6 +30,7 @@ this.rpc.onsignalingstatechange = this.handleState.bind(this); this._currentMessages = []; this._remoteStream = {}; + this._connectionState = ""; } get remoteStream() { @@ -40,6 +41,10 @@ return this._selfStream; } + get connectionState() { + return this._connectionState; + } + /** * Mimics node's on/emit event handlers. * Raises an event. @@ -119,7 +124,8 @@ * @fires Chat#ice-connection-changed */ handleIceConnectionState(ev) { - this.emit('ice-connection-changed', ev.target.iceConnectionState) + this._connectionState = ev.target.iceConnectionState; + this.emit('ice-connection-changed', ev.target.iceConnectionState); } /** From ab2cf962a5bf92ddd75222b4b9166a9b6947a18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 16:17:04 -0300 Subject: [PATCH 232/237] Add no-video-message --- webchat/components/chat/body/chat-body.css | 14 ++++++++++++++ webchat/components/chat/body/chat-body.html | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index bbc6aa3ab..982f2197d 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -13,6 +13,7 @@ } .chat-body__video-container { + display: grid; background-color: darkgray; max-width: 100%; max-height: 100%; @@ -31,6 +32,19 @@ margin: 10px 10px auto; } +.chat-body__no-video-message { + background-color: #009688; + color: white; + border-radius: 10px; + padding: 10px 20px; + height: fit-content; + width: fit-content; + margin: 10px; + text-align: center; + align-self: center; + justify-self: center; +} + #video-remote { height: 100%; width: 100%; diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index 8c61a3da1..f9c0eac60 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -7,6 +7,9 @@
    - - +
    + + +
    + Nenhum vídeo está sendo recebido
    From 679211012b2c9bc90d06456a60146f3c134d2ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 16:30:48 -0300 Subject: [PATCH 233/237] Fix chat body scroll --- webchat/components/chat/body/chat-body.css | 7 ++++++- webchat/components/chat/body/chat-body.html | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index 982f2197d..fbde78d32 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -3,12 +3,17 @@ width: 100%; } +.chat-body__messages-wrapper { + overflow-y: auto; + max-height: 100%; + max-width: 100%; +} + .chat-body__messages-container { height: 100%; max-height: 100%; display: flex; flex-direction: column; - overflow-y: scroll; justify-content: flex-end; } diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index f9c0eac60..f864d89a5 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -1,11 +1,13 @@ -
    - Esta é uma conversa segura e não esta sendo gravada - - -
    +
    +
    + Esta é uma conversa segura e não esta sendo gravada + + +
    +
    From 47c9203268d94badc8200fd7641858cf0e54fd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 16:31:05 -0300 Subject: [PATCH 234/237] Fix layout break when word is too big --- webchat/components/chat/message/chat-message.css | 1 + 1 file changed, 1 insertion(+) diff --git a/webchat/components/chat/message/chat-message.css b/webchat/components/chat/message/chat-message.css index 0c244fb3e..498676fc7 100644 --- a/webchat/components/chat/message/chat-message.css +++ b/webchat/components/chat/message/chat-message.css @@ -14,6 +14,7 @@ .chat-message__text { grid-area: text; + word-break: break-word; } .chat-message__time { From 40fe2c5df3e9a25a16ca706baf6ca06e7299bf84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 16:32:12 -0300 Subject: [PATCH 235/237] Fix info-message margin --- webchat/components/chat/body/chat-body.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.css b/webchat/components/chat/body/chat-body.css index fbde78d32..7bfd72bec 100644 --- a/webchat/components/chat/body/chat-body.css +++ b/webchat/components/chat/body/chat-body.css @@ -34,7 +34,7 @@ padding: 10px 20px; border-radius: 10px; align-self: center; - margin: 10px 10px auto; + margin: 10px 10px; } .chat-body__no-video-message { From 5db1a6b66f1d2b1506e5798e8c7051214d856885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Sun, 17 Mar 2019 16:35:19 -0300 Subject: [PATCH 236/237] Fix div definition on chat body --- webchat/components/chat/body/chat-body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/components/chat/body/chat-body.html b/webchat/components/chat/body/chat-body.html index f864d89a5..47831ae3b 100644 --- a/webchat/components/chat/body/chat-body.html +++ b/webchat/components/chat/body/chat-body.html @@ -7,7 +7,7 @@ message-obj="message">
    - +
    From 14597913c29c75e882de8542fdc78e74d694efe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Mar 2019 12:54:21 -0300 Subject: [PATCH 237/237] Change websocket url to production --- webchat/app.js | 3 +-- webchat/utils/chatClient.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webchat/app.js b/webchat/app.js index 11431b295..1dcd7984f 100644 --- a/webchat/app.js +++ b/webchat/app.js @@ -17,8 +17,7 @@ }); app.constant('WEBSOCKET', { - hostname: window.location.hostname, - port: 8090, + url: "ws://webchat-server-dot-development-cis.appspot.com/", maxRetries: 5, }); diff --git a/webchat/utils/chatClient.js b/webchat/utils/chatClient.js index 1770a30f8..65fbc2051 100644 --- a/webchat/utils/chatClient.js +++ b/webchat/utils/chatClient.js @@ -57,7 +57,7 @@ * Starts a new connection with the websocket server. */ startWebsocket() { - const websocket = `ws://${WEBSOCKET.hostname}:${WEBSOCKET.port}`; + const websocket = WEBSOCKET.url; this.ws = new WebSocket(websocket); // Sends a signin message to the websocket as soon as the websocket connects