kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'

Browse source 
This reverts commit b7c5ca499d, reversing
changes made to 9745c98bb7.
This commit is contained in:
Alfredo Sumaran 2017-02-10 15:21:45 -05:00
parent 63caff8fcd
commit 7b20784715
14 changed files with 29 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
View file

@ -97,7 +97,7 @@ $(() => {
}
this.isLoadingStage = true;
cycleAnalyticsStore.setStageEvents([], stage);
cycleAnalyticsStore.setStageEvents([]);
cycleAnalyticsStore.setActiveStage(stage);
cycleAnalyticsService
@ -107,7 +107,7 @@ $(() => {
})
.done((response) => {
this.isEmptyStage = !response.events.length;
cycleAnalyticsStore.setStageEvents(response.events, stage);
cycleAnalyticsStore.setStageEvents(response.events);
})
.error(() => {
this.isEmptyStage = true;

47
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
View file

@ -1,8 +1,4 @@
/* eslint-disable no-param-reassign */
require('../lib/utils/text_utility');
const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
((global) => {
global.cycleAnalytics = global.cycleAnalytics || {};
@ -38,12 +34,11 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
});
newData.stages.forEach((item) => {
const stageSlug = gl.text.dasherize(item.title.toLowerCase());
const stageName = item.title.toLowerCase();
item.active = false;
item.isUserAllowed = data.permissions[stageSlug];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageSlug];
item.component = `stage-${stageSlug}-component`;
item.slug = stageSlug;
item.isUserAllowed = data.permissions[stageName];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageName];
item.component = `stage-${stageName}-component`;
});
newData.analytics = data;
return newData;
@ -63,33 +58,31 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
this.deactivateAllStages();
stage.active = true;
},
setStageEvents(events, stage) {
this.state.events = this.decorateEvents(events, stage);
setStageEvents(events) {
this.state.events = this.decorateEvents(events);
},
decorateEvents(events, stage) {
decorateEvents(events) {
const newEvents = [];
events.forEach((item) => {
if (!item) return;
const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
item.totalTime = item.total_time;
item.author.webUrl = item.author.web_url;
item.author.avatarUrl = item.author.avatar_url;
eventItem.totalTime = eventItem.total_time;
eventItem.author.webUrl = eventItem.author.web_url;
eventItem.author.avatarUrl = eventItem.author.avatar_url;
if (item.created_at) item.createdAt = item.created_at;
if (item.short_sha) item.shortSha = item.short_sha;
if (item.commit_url) item.commitUrl = item.commit_url;
if (eventItem.created_at) eventItem.createdAt = eventItem.created_at;
if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha;
if (eventItem.commit_url) eventItem.commitUrl = eventItem.commit_url;
delete item.author.web_url;
delete item.author.avatar_url;
delete item.total_time;
delete item.created_at;
delete item.short_sha;
delete item.commit_url;
delete eventItem.author.web_url;
delete eventItem.author.avatar_url;
delete eventItem.total_time;
delete eventItem.created_at;
delete eventItem.short_sha;
delete eventItem.commit_url;
newEvents.push(eventItem);
newEvents.push(item);
});
return newEvents;

98
app/assets/javascripts/cycle_analytics/default_event_objects.js.es6
View file

@ -1,98 +0,0 @@
module.exports = {
issue: {
created_at: '',
url: '',
iid: '',
title: '',
total_time: {},
author: {
avatar_url: '',
id: '',
name: '',
web_url: '',
},
},
plan: {
title: '',
commit_url: '',
short_sha: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
code: {
title: '',
iid: '',
created_at: '',
url: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
test: {
name: '',
id: '',
date: '',
url: '',
short_sha: '',
commit_url: '',
total_time: {},
branch: {
name: '',
url: '',
},
},
review: {
title: '',
iid: '',
created_at: '',
url: '',
state: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
staging: {
id: '',
short_sha: '',
date: '',
url: '',
commit_url: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
branch: {
name: '',
url: '',
},
},
production: {
title: '',
created_at: '',
url: '',
iid: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
};

10
app/assets/javascripts/lib/utils/text_utility.js
View file

@ -1,7 +1,5 @@
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len */
require('vendor/latinise');
(function() {
(function(w) {
var base;
@ -166,14 +164,8 @@ require('vendor/latinise');
gl.text.pluralize = function(str, count) {
return str + (count > 1 || count === 0 ? 's' : '');
};
gl.text.truncate = function(string, maxLength) {
return gl.text.truncate = function(string, maxLength) {
return string.substr(0, (maxLength - 3)) + '...';
};
gl.text.dasherize = function(str) {
return str.replace(/[_\s]+/g, '-');
};
gl.text.slugify = function(str) {
return str.trim().toLowerCase().latinise();
};
})(window);
}).call(this);

6
app/assets/javascripts/wikis.js.es6
View file

@ -1,10 +1,14 @@
/* eslint-disable no-param-reassign */
/* global Breakpoints */
require('vendor/latinise');
require('./breakpoints');
require('vendor/jquery.nicescroll');
((global) => {
const dasherize = str => str.replace(/[_\s]+/g, '-');
const slugify = str => dasherize(str.trim().toLowerCase().latinise());
class Wikis {
constructor() {
this.bp = Breakpoints.get();
@ -30,7 +34,7 @@ require('vendor/jquery.nicescroll');
if (!this.newWikiForm) return;
const slugInput = this.newWikiForm.querySelector('#new_wiki_path');
const slug = gl.text.slugify(slugInput.value);
const slug = slugify(slugInput.value);
if (slug.length > 0) {
const wikisPath = slugInput.getAttribute('data-wikis-path');

1
app/serializers/analytics_stage_entity.rb
View file

@ -2,7 +2,6 @@ class AnalyticsStageEntity < Grape::Entity
include EntityDateHelper
expose :title
expose :legend
expose :description
expose :median, as: :value do |stage|

2
app/views/projects/cycle_analytics/show.html.haml
View file

@ -44,7 +44,7 @@
Last 90 days
.stage-panel-container
.panel.panel-default.stage-panel
.panel-heading
.panel-heading
%nav.col-headers
%ul
%li.stage-header

4
lib/gitlab/cycle_analytics/code_stage.rb
View file

@ -13,10 +13,6 @@ module Gitlab
:code
end
def legend
"Related Merge Requests"
end
def description
"Time until first merge request"
end

4
lib/gitlab/cycle_analytics/issue_stage.rb
View file

@ -14,10 +14,6 @@ module Gitlab
:issue
end
def legend
"Related Issues"
end
def description
"Time before an issue gets scheduled"
end

4
lib/gitlab/cycle_analytics/plan_stage.rb
View file

@ -14,10 +14,6 @@ module Gitlab
:plan
end
def legend
"Related Commits"
end
def description
"Time before an issue starts implementation"
end

4
lib/gitlab/cycle_analytics/production_stage.rb
View file

@ -15,10 +15,6 @@ module Gitlab
:production
end
def legend
"Related Issues"
end
def description
"From issue creation until deploy to production"
end

4
lib/gitlab/cycle_analytics/review_stage.rb
View file

@ -13,10 +13,6 @@ module Gitlab
:review
end
def legend
"Relative Merged Requests"
end
def description
"Time between merge request creation and merge/close"
end

4
lib/gitlab/cycle_analytics/staging_stage.rb
View file

@ -14,10 +14,6 @@ module Gitlab
:staging
end
def legend
"Relative Deployed Builds"
end
def description
"From merge request merge until deploy to production"
end

4
lib/gitlab/cycle_analytics/test_stage.rb
View file

@ -13,10 +13,6 @@ module Gitlab
:test
end
def legend
"Relative Builds Trigger by Commits"
end
def description
"Total test time for all commits/merges"
end