diff --git a/src/js/client.js b/src/js/client.js index 6e4419a2f..d19b2654b 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -5,6 +5,58 @@ /* global EventSource:false */ /* global asyncForEach:false */ +// keep in sync with box/src/apps.js +var ISTATES = { + PENDING_INSTALL: 'pending_install', + PENDING_CLONE: 'pending_clone', + PENDING_CONFIGURE: 'pending_configure', + PENDING_UNINSTALL: 'pending_uninstall', + PENDING_RESTORE: 'pending_restore', + PENDING_UPDATE: 'pending_update', + PENDING_BACKUP: 'pending_backup', + PENDING_RECREATE_CONTAINER: 'pending_recreate_container', // env change or addon change + PENDING_LOCATION_CHANGE: 'pending_location_change', + PENDING_DATA_DIR_MIGRATION: 'pending_data_dir_migration', + PENDING_RESIZE: 'pending_resize', + PENDING_DEBUG: 'pending_debug', + PENDING_START: 'pending_start', + PENDING_STOP: 'pending_stop', + ERROR: 'error', + INSTALLED: 'installed' +}; + +var HSTATES = { + HEALTHY: 'healthy', + UNHEALTHY: 'unhealthy', + ERROR: 'error', + DEAD: 'dead' +}; + +var RSTATES ={ + RUNNING: 'running', + STOPPED: 'stopped' +}; + +var ERROR = { + ACCESS_DENIED: 'Access Denied', + ALREADY_EXISTS: 'Already Exists', + BAD_FIELD: 'Bad Field', + COLLECTD_ERROR: 'Collectd Error', + CONFLICT: 'Conflict', + DATABASE_ERROR: 'Database Error', + DNS_ERROR: 'DNS Error', + DOCKER_ERROR: 'Docker Error', + EXTERNAL_ERROR: 'External Error', + FS_ERROR: 'FileSystem Error', + INTERNAL_ERROR: 'Internal Error', + LOGROTATE_ERROR: 'Logrotate Error', + NETWORK_ERROR: 'Network Error', + NOT_FOUND: 'Not found', + REVERSEPROXY_ERROR: 'ReverseProxy Error', + TASK_ERROR: 'Task Error', + UNKNOWN_ERROR: 'Unknown Error' // only used for portin, +}; + angular.module('Application').service('Client', ['$http', '$interval', '$timeout', 'md5', 'Notification', function ($http, $interval, $timeout, md5, Notification) { var client = null; diff --git a/src/js/index.js b/src/js/index.js index 144660de6..7d11ac143 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -4,6 +4,7 @@ /* global showdown:false */ /* global moment:false */ /* global $:false */ +/* global ERROR,ISTATES,HSTATES,RSTATES */ // deal with accessToken in the query, this is passed for example on password reset and account setup upon invite var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {}); @@ -161,55 +162,6 @@ app.config(['$routeProvider', function ($routeProvider) { }).otherwise({ redirectTo: '/'}); }]); -// keep in sync with box/src/apps.js -var ISTATES = { - PENDING_INSTALL: 'pending_install', - PENDING_CLONE: 'pending_clone', - PENDING_CONFIGURE: 'pending_configure', - PENDING_UNINSTALL: 'pending_uninstall', - PENDING_RESTORE: 'pending_restore', - PENDING_UPDATE: 'pending_update', - PENDING_BACKUP: 'pending_backup', - PENDING_RECREATE_CONTAINER: 'pending_recreate_container', // env change or addon change - PENDING_LOCATION_CHANGE: 'pending_location_change', - PENDING_DATA_DIR_MIGRATION: 'pending_data_dir_migration', - PENDING_RESIZE: 'pending_resize', - PENDING_DEBUG: 'pending_debug', - PENDING_START: 'pending_start', - PENDING_STOP: 'pending_stop', - ERROR: 'error', - INSTALLED: 'installed' -}; -var HSTATES = { - HEALTHY: 'healthy', - UNHEALTHY: 'unhealthy', - ERROR: 'error', - DEAD: 'dead' -}; -var RSTATES ={ - RUNNING: 'running', - STOPPED: 'stopped' -}; -var ERROR = { - ACCESS_DENIED: 'Access Denied', - ALREADY_EXISTS: 'Already Exists', - BAD_FIELD: 'Bad Field', - COLLECTD_ERROR: 'Collectd Error', - CONFLICT: 'Conflict', - DATABASE_ERROR: 'Database Error', - DNS_ERROR: 'DNS Error', - DOCKER_ERROR: 'Docker Error', - EXTERNAL_ERROR: 'External Error', - FS_ERROR: 'FileSystem Error', - INTERNAL_ERROR: 'Internal Error', - LOGROTATE_ERROR: 'Logrotate Error', - NETWORK_ERROR: 'Network Error', - NOT_FOUND: 'Not found', - REVERSEPROXY_ERROR: 'ReverseProxy Error', - TASK_ERROR: 'Task Error', - UNKNOWN_ERROR: 'Unknown Error' // only used for portin, -}; - app.filter('installError', function () { return function (app) { if (!app) return false;