diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js index a67aaf1..c9ab9da 100644 --- a/backend/src/appenlight/static/js/appenlight.js +++ b/backend/src/appenlight/static/js/appenlight.js @@ -2547,7 +2547,7 @@ function decodeEncodedJSON (input){ delete doc; return val; }catch(exc){ - console.error('decodeEncodedJSON:' + exc + ' input:' + input); + delete doc; } } @@ -2600,16 +2600,16 @@ function timeSpanToStartDate(timeSpan){ /* Sets server validation messages on form using angular machinery + * custom key holding actual error messages */ function setServerValidation(form, errors){ - console.log('form', form); + if (typeof form.ae_validation === 'undefined'){ form.ae_validation = {}; - console.log('create ae_validation key'); + } for (var key in form.ae_validation){ form.ae_validation[key] = []; - console.log('clear key:', key); + } - console.log('errors:',errors); + for (var key in form){ if (key[0] !== '$' && key !== 'ae_validation'){ @@ -2688,6 +2688,18 @@ angular.module('appenlight.components', [ 'appenlight.components.userAuthTokensView', 'appenlight.components.userAlertChannelsListView', 'appenlight.components.userAlertChannelsEmailNewView', + 'appenlight.components.applicationsListView', + 'appenlight.components.applicationsPurgeLogsView', + 'appenlight.components.applicationsUpdateView', + 'appenlight.components.integrationsListView', + 'appenlight.components.bitbucketIntegrationConfigView', + 'appenlight.components.campfireIntegrationConfigView', + 'appenlight.components.flowdockIntegrationConfigView', + 'appenlight.components.githubIntegrationConfigView', + 'appenlight.components.hipchatIntegrationConfigView', + 'appenlight.components.jiraIntegrationConfigView', + 'appenlight.components.slackIntegrationConfigView', + 'appenlight.components.webhooksIntegrationConfigView', 'appenlight.components.settingsView' ]); angular.module('appenlight.directives', [ @@ -2720,7 +2732,7 @@ var pluginsToLoad = _.map(decodeEncodedJSON(window.AE.plugins), function(item){ return item.config.angular_module }); -console.log(pluginsToLoad); + angular.module('appenlight.plugins', pluginsToLoad); var app = angular.module('appenlight', [ @@ -2816,7 +2828,7 @@ function kickstartAE(initialUserData) { AeConfig.urls.otherRoutes.lostPassword, AeConfig.urls.otherRoutes.lostPasswordGenerate ]; - console.log('$transitions.onBefore', path, $transition$.to().name, $state); + _.each(openViews, function (url) { var url = '/' + url.split('/').slice(3).join('/'); if (url === path) { @@ -2825,7 +2837,7 @@ function kickstartAE(initialUserData) { }); if (stateHolder.AeUser.id === null && !isGuestState && !isOpenView) { if (window.location.toString().indexOf(AeConfig.urls.otherRoutes.register) === -1) { - console.log('redirect to register'); + var newLocation = AeConfig.urls.otherRoutes.register + '?came_from=' + encodeURIComponent(window.location); // fix infinite digest here $rootScope.$on('$locationChangeStart', @@ -2973,3206 +2985,3183 @@ function kickstartAE(initialUserData) { ); - $templateCache.put('components/views/event-browser/event-browser.html', - "
\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " | \n" + - "\n" +
- " For {{ event.resource_name }} \n" + + " \n" + + " \n" + + " Bitbucket\n" + "\n" + - "{{ event.text }} \n" + - " created:\n" + - " | \n" +
- " \n" +
+ " Send issues and reports to Bitbucket \n" + + " \n" + "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + + " \n" + + " \n" + + " Campfire\n" + "\n" + - " | \n" +
- "
Receive reports and alerts on your Flowdock team\n" + + " inbox
\n" + + " \n" + "\n" + - " \n" + + " \n" + + " \n" + + " Github\n" + "\n" + - "Send issues and reports to Github
\n" + + " \n" + "\n" + - "\n" + - " \n" + - "
\n" + + "Receive reports and alerts in your Slack chanels
\n" + + " \n" + "\n" + - "Notify third party API's of your reports and alerts
\n" + + " \n" + + "You have to create a new application first.
\n" + "\n" + - "\n" + - " Average requests per second from all servers\n" + - "
\n" + + "\n" + - " Average response time from all servers\n" + - "
\n" + + "Resource Name | \n" + + "Domains | \n" + + "Options | \n" + + "
---|---|---|
{{application.resource_name}} | \n" + + "{{application.domains}} | \n" + + "\n" + + " Update\n" + + " Integrations\n" + + " | \n" + + "
\n" + - " Aggregated average time spent per request - broken to layers\n" + - "
\n" + + "\n" + - " Aggregated reports sent by your application\n" + - "
\n" + + "\n" + - " Aggregated slow reports sent by your application\n" + - "
\n" + - "