Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bf30a780
Commit
bf30a780
authored
Feb 10, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure events have most properties defined
parent
d3ff2fa5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
137 additions
and
28 deletions
+137
-28
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
...javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
+2
-2
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
.../javascripts/cycle_analytics/cycle_analytics_store.js.es6
+27
-20
app/assets/javascripts/cycle_analytics/default_event_objects.js.es6
.../javascripts/cycle_analytics/default_event_objects.js.es6
+98
-0
app/assets/javascripts/lib/utils/text_utility.js
app/assets/javascripts/lib/utils/text_utility.js
+9
-1
app/assets/javascripts/wikis.js.es6
app/assets/javascripts/wikis.js.es6
+1
-5
No files found.
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
View file @
bf30a780
...
@@ -97,7 +97,7 @@ $(() => {
...
@@ -97,7 +97,7 @@ $(() => {
}
}
this.isLoadingStage = true;
this.isLoadingStage = true;
cycleAnalyticsStore.setStageEvents([]);
cycleAnalyticsStore.setStageEvents([]
, stage
);
cycleAnalyticsStore.setActiveStage(stage);
cycleAnalyticsStore.setActiveStage(stage);
cycleAnalyticsService
cycleAnalyticsService
...
@@ -107,7 +107,7 @@ $(() => {
...
@@ -107,7 +107,7 @@ $(() => {
})
})
.done((response) => {
.done((response) => {
this.isEmptyStage = !response.events.length;
this.isEmptyStage = !response.events.length;
cycleAnalyticsStore.setStageEvents(response.events);
cycleAnalyticsStore.setStageEvents(response.events
, stage
);
})
})
.error(() => {
.error(() => {
this.isEmptyStage = true;
this.isEmptyStage = true;
...
...
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
View file @
bf30a780
/* eslint-disable no-param-reassign */
/* eslint-disable no-param-reassign */
require('../lib/utils/text_utility');
const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
((global) => {
((global) => {
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics = global.cycleAnalytics || {};
...
@@ -34,11 +38,12 @@
...
@@ -34,11 +38,12 @@
});
});
newData.stages.forEach((item) => {
newData.stages.forEach((item) => {
const stage
Name = item.title.toLowerCase(
);
const stage
Slug = gl.text.dasherize(item.title.toLowerCase()
);
item.active = false;
item.active = false;
item.isUserAllowed = data.permissions[stageName];
item.isUserAllowed = data.permissions[stageSlug];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageName];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageSlug];
item.component = `stage-${stageName}-component`;
item.component = `stage-${stageSlug}-component`;
item.slug = stageSlug;
});
});
newData.analytics = data;
newData.analytics = data;
return newData;
return newData;
...
@@ -58,31 +63,33 @@
...
@@ -58,31 +63,33 @@
this.deactivateAllStages();
this.deactivateAllStages();
stage.active = true;
stage.active = true;
},
},
setStageEvents(events) {
setStageEvents(events
, stage
) {
this.state.events = this.decorateEvents(events);
this.state.events = this.decorateEvents(events
, stage
);
},
},
decorateEvents(events) {
decorateEvents(events
, stage
) {
const newEvents = [];
const newEvents = [];
events.forEach((item) => {
events.forEach((item) => {
if (!item) return;
if (!item) return;
item.totalTime = item.total_time;
const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
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 = i
tem.created_at;
if (
eventItem.created_at) eventItem.createdAt = eventI
tem.created_at;
if (
item.short_sha) item.shortSha = i
tem.short_sha;
if (
eventItem.short_sha) eventItem.shortSha = eventI
tem.short_sha;
if (
item.commit_url) item.commitUrl = i
tem.commit_url;
if (
eventItem.commit_url) eventItem.commitUrl = eventI
tem.commit_url;
delete
i
tem.author.web_url;
delete
eventI
tem.author.web_url;
delete
i
tem.author.avatar_url;
delete
eventI
tem.author.avatar_url;
delete
i
tem.total_time;
delete
eventI
tem.total_time;
delete
i
tem.created_at;
delete
eventI
tem.created_at;
delete
i
tem.short_sha;
delete
eventI
tem.short_sha;
delete
i
tem.commit_url;
delete
eventI
tem.commit_url;
newEvents.push(
i
tem);
newEvents.push(
eventI
tem);
});
});
return newEvents;
return newEvents;
...
...
app/assets/javascripts/cycle_analytics/default_event_objects.js.es6
0 → 100644
View file @
bf30a780
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: '',
},
},
};
app/assets/javascripts/lib/utils/text_utility.js
View file @
bf30a780
/* 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 */
/* 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
()
{
(
function
(
w
)
{
(
function
(
w
)
{
var
base
;
var
base
;
...
@@ -164,8 +166,14 @@
...
@@ -164,8 +166,14 @@
gl
.
text
.
pluralize
=
function
(
str
,
count
)
{
gl
.
text
.
pluralize
=
function
(
str
,
count
)
{
return
str
+
(
count
>
1
||
count
===
0
?
'
s
'
:
''
);
return
str
+
(
count
>
1
||
count
===
0
?
'
s
'
:
''
);
};
};
return
gl
.
text
.
truncate
=
function
(
string
,
maxLength
)
{
gl
.
text
.
truncate
=
function
(
string
,
maxLength
)
{
return
string
.
substr
(
0
,
(
maxLength
-
3
))
+
'
...
'
;
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
);
})(
window
);
}).
call
(
this
);
}).
call
(
this
);
app/assets/javascripts/wikis.js.es6
View file @
bf30a780
/* eslint-disable no-param-reassign */
/* eslint-disable no-param-reassign */
/* global Breakpoints */
/* global Breakpoints */
require('vendor/latinise');
require('./breakpoints');
require('./breakpoints');
require('vendor/jquery.nicescroll');
require('vendor/jquery.nicescroll');
((global) => {
((global) => {
const dasherize = str => str.replace(/[_\s]+/g, '-');
const slugify = str => dasherize(str.trim().toLowerCase().latinise());
class Wikis {
class Wikis {
constructor() {
constructor() {
this.bp = Breakpoints.get();
this.bp = Breakpoints.get();
...
@@ -34,7 +30,7 @@ require('vendor/jquery.nicescroll');
...
@@ -34,7 +30,7 @@ require('vendor/jquery.nicescroll');
if (!this.newWikiForm) return;
if (!this.newWikiForm) return;
const slugInput = this.newWikiForm.querySelector('#new_wiki_path');
const slugInput = this.newWikiForm.querySelector('#new_wiki_path');
const slug = slugify(slugInput.value);
const slug =
gl.text.
slugify(slugInput.value);
if (slug.length > 0) {
if (slug.length > 0) {
const wikisPath = slugInput.getAttribute('data-wikis-path');
const wikisPath = slugInput.getAttribute('data-wikis-path');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment