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
92acb79a
Commit
92acb79a
authored
Jul 02, 2020
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display toast message on submit
Adds the toast component to the VSA app Update gitlab pot file
parent
7d86a048
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
16 deletions
+44
-16
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
...javascripts/analytics/cycle_analytics/components/base.vue
+8
-7
ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue
...lytics/cycle_analytics/components/value_stream_select.vue
+17
-8
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
+3
-0
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
...rontend/analytics/cycle_analytics/components/base_spec.js
+4
-1
locale/gitlab.pot
locale/gitlab.pot
+12
-0
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @
92acb79a
<
script
>
<
script
>
import
{
GlEmptyState
,
GlLoadingIcon
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlEmptyState
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlBreakpointInstance
as
bp
}
from
'
@gitlab/ui/dist/utils
'
;
import
{
GlBreakpointInstance
as
bp
}
from
'
@gitlab/ui/dist/utils
'
;
import
{
mapActions
,
mapState
,
mapGetters
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
,
mapGetters
}
from
'
vuex
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
featureAccessLevel
}
from
'
~/pages/projects/shared/permissions/constants
'
;
import
{
featureAccessLevel
}
from
'
~/pages/projects/shared/permissions/constants
'
;
import
{
PROJECTS_PER_PAGE
,
STAGE_ACTIONS
}
from
'
../constants
'
;
import
{
PROJECTS_PER_PAGE
,
STAGE_ACTIONS
}
from
'
../constants
'
;
import
GroupsDropdownFilter
from
'
../../shared/components/groups_dropdown_filter.vue
'
;
import
GroupsDropdownFilter
from
'
../../shared/components/groups_dropdown_filter.vue
'
;
...
@@ -199,8 +200,9 @@ export default {
...
@@ -199,8 +200,9 @@ export default {
onStageReorder
(
data
)
{
onStageReorder
(
data
)
{
this
.
reorderStage
(
data
);
this
.
reorderStage
(
data
);
},
},
onCreateValueStream
()
{
onCreateValueStream
({
name
})
{
// stub handler - to be implemented in a follow up
// stub - this will eventually trigger a vuex action
this
.
$toast
.
show
(
sprintf
(
__
(
"
'%{name}' Value Stream created
"
),
{
name
}));
},
},
},
},
multiProjectSelect
:
true
,
multiProjectSelect
:
true
,
...
@@ -224,16 +226,15 @@ export default {
...
@@ -224,16 +226,15 @@ export default {
class=
"gl-mb-3 gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-justify-content-space-between"
class=
"gl-mb-3 gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-justify-content-space-between"
>
>
<h3>
{{
__
(
'
Value Stream Analytics
'
)
}}
</h3>
<h3>
{{
__
(
'
Value Stream Analytics
'
)
}}
</h3>
<
div
<
value-stream-select
v-if=
"shouldDisplayCreateMultipleValueStreams"
v-if=
"shouldDisplayCreateMultipleValueStreams"
class=
"gl-align-self-center"
class=
"gl-align-self-center"
:class=
"
{
:class=
"
{
'gl-w-full': isXSBreakpoint,
'gl-w-full': isXSBreakpoint,
'gl-mt-5': !isXSBreakpoint,
'gl-mt-5': !isXSBreakpoint,
}"
}"
>
@create="onCreateValueStream"
<value-stream-select
@
create=
"onCreateValueStream"
/>
/>
</div>
</div>
</div>
<div
class=
"mw-100"
>
<div
class=
"mw-100"
>
<div
class=
"mt-3 py-2 px-3 bg-gray-light border-top border-bottom"
>
<div
class=
"mt-3 py-2 px-3 bg-gray-light border-top border-bottom"
>
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue
View file @
92acb79a
...
@@ -11,12 +11,16 @@ export default {
...
@@ -11,12 +11,16 @@ export default {
GlModalDirective
,
GlModalDirective
,
},
},
props
:
{},
props
:
{},
computed
:
{},
data
()
{
data
()
{
return
{
return
{
name
:
''
,
name
:
''
,
};
};
},
},
computed
:
{
isValid
()
{
return
Boolean
(
this
.
name
.
length
);
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -26,17 +30,22 @@ export default {
...
@@ -26,17 +30,22 @@ export default {
data-testid=
"create-value-stream"
data-testid=
"create-value-stream"
>
{{
__
(
'
Create new value stream
'
)
}}
</gl-button
>
{{
__
(
'
Create new value stream
'
)
}}
</gl-button
>
>
<!-- no-fade: no idea 🤷♂️ -->
<gl-modal
<gl-modal
modal-id=
"create-value-stream-modal"
modal-id=
"create-value-stream-modal"
:title=
"__('Value stream name')"
:title=
"__('Value Stream Name')"
no-fade
:action-primary=
"
{
:action-primary=
"
{ text: __('Create value stream') }"
text: __('Create value stream'),
attributes: [
{ variant: 'primary' },
{
disabled: !isValid,
},
],
}"
:action-cancel="{ text: __('Cancel') }"
:action-cancel="{ text: __('Cancel') }"
@primary="$emit('create')"
@primary="$emit('create'
, { name }
)"
>
>
<gl-form-input
id=
"name"
:value
=
"name"
:placeholder=
"__('Example: My value stream')"
/>
<gl-form-input
id=
"name"
v-model
=
"name"
:placeholder=
"__('Example: My value stream')"
/>
</gl-modal>
</gl-modal>
<!-- :action-cancel -->
</div>
</div>
</
template
>
</
template
>
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
View file @
92acb79a
...
@@ -3,6 +3,9 @@ import CycleAnalytics from './components/base.vue';
...
@@ -3,6 +3,9 @@ import CycleAnalytics from './components/base.vue';
import
createStore
from
'
./store
'
;
import
createStore
from
'
./store
'
;
import
{
buildCycleAnalyticsInitialData
}
from
'
../shared/utils
'
;
import
{
buildCycleAnalyticsInitialData
}
from
'
../shared/utils
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
GlToast
}
from
'
@gitlab/ui
'
;
Vue
.
use
(
GlToast
);
export
default
()
=>
{
export
default
()
=>
{
const
el
=
document
.
querySelector
(
'
#js-cycle-analytics-app
'
);
const
el
=
document
.
querySelector
(
'
#js-cycle-analytics-app
'
);
...
...
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
View file @
92acb79a
...
@@ -18,6 +18,7 @@ import FilterBar from 'ee/analytics/cycle_analytics/components/filter_bar.vue';
...
@@ -18,6 +18,7 @@ import FilterBar from 'ee/analytics/cycle_analytics/components/filter_bar.vue';
import
DurationChart
from
'
ee/analytics/cycle_analytics/components/duration_chart.vue
'
;
import
DurationChart
from
'
ee/analytics/cycle_analytics/components/duration_chart.vue
'
;
import
Daterange
from
'
ee/analytics/shared/components/daterange.vue
'
;
import
Daterange
from
'
ee/analytics/shared/components/daterange.vue
'
;
import
TypeOfWorkCharts
from
'
ee/analytics/cycle_analytics/components/type_of_work_charts.vue
'
;
import
TypeOfWorkCharts
from
'
ee/analytics/cycle_analytics/components/type_of_work_charts.vue
'
;
import
ValueStreamSelect
from
'
ee/analytics/cycle_analytics/components/value_stream_select.vue
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
httpStatusCodes
from
'
~/lib/utils/http_status
'
;
import
httpStatusCodes
from
'
~/lib/utils/http_status
'
;
import
*
as
commonUtils
from
'
~/lib/utils/common_utils
'
;
import
*
as
commonUtils
from
'
~/lib/utils/common_utils
'
;
...
@@ -44,6 +45,7 @@ const defaultStubs = {
...
@@ -44,6 +45,7 @@ const defaultStubs = {
'
labels-selector
'
:
true
,
'
labels-selector
'
:
true
,
DurationChart
:
true
,
DurationChart
:
true
,
GroupsDropdownFilter
:
true
,
GroupsDropdownFilter
:
true
,
ValueStreamSelect
:
true
,
};
};
const
defaultFeatureFlags
=
{
const
defaultFeatureFlags
=
{
...
@@ -171,7 +173,7 @@ describe('Cycle Analytics component', () => {
...
@@ -171,7 +173,7 @@ describe('Cycle Analytics component', () => {
};
};
const
displaysCreateValueStream
=
flag
=>
{
const
displaysCreateValueStream
=
flag
=>
{
expect
(
wrapper
.
find
(
'
[data-testid="create-value-stream"]
'
).
exists
()).
toBe
(
flag
);
expect
(
wrapper
.
find
(
ValueStreamSelect
).
exists
()).
toBe
(
flag
);
};
};
beforeEach
(()
=>
{
beforeEach
(()
=>
{
...
@@ -237,6 +239,7 @@ describe('Cycle Analytics component', () => {
...
@@ -237,6 +239,7 @@ describe('Cycle Analytics component', () => {
it
(
'
does not display the path navigation
'
,
()
=>
{
it
(
'
does not display the path navigation
'
,
()
=>
{
displaysPathNavigation
(
false
);
displaysPathNavigation
(
false
);
});
});
it
(
'
does not display the create multiple value streams button
'
,
()
=>
{
it
(
'
does not display the create multiple value streams button
'
,
()
=>
{
displaysCreateValueStream
(
false
);
displaysCreateValueStream
(
false
);
});
});
...
...
locale/gitlab.pot
View file @
92acb79a
...
@@ -735,6 +735,9 @@ msgstr ""
...
@@ -735,6 +735,9 @@ msgstr ""
msgid "'%{level}' is not a valid visibility level"
msgid "'%{level}' is not a valid visibility level"
msgstr ""
msgstr ""
msgid "'%{name}' Value Stream created"
msgstr ""
msgid "'%{name}' stage already exists"
msgid "'%{name}' stage already exists"
msgstr ""
msgstr ""
...
@@ -6857,6 +6860,9 @@ msgstr ""
...
@@ -6857,6 +6860,9 @@ msgstr ""
msgid "Create snippet"
msgid "Create snippet"
msgstr ""
msgstr ""
msgid "Create value stream"
msgstr ""
msgid "Create wildcard: %{searchTerm}"
msgid "Create wildcard: %{searchTerm}"
msgstr ""
msgstr ""
...
@@ -9451,6 +9457,9 @@ msgstr ""
...
@@ -9451,6 +9457,9 @@ msgstr ""
msgid "Example: @sub\\.company\\.com$"
msgid "Example: @sub\\.company\\.com$"
msgstr ""
msgstr ""
msgid "Example: My value stream"
msgstr ""
msgid "Example: Usage = single query. (Requested) / (Capacity) = multiple queries combined into a formula."
msgid "Example: Usage = single query. (Requested) / (Capacity) = multiple queries combined into a formula."
msgstr ""
msgstr ""
...
@@ -25592,6 +25601,9 @@ msgstr ""
...
@@ -25592,6 +25601,9 @@ msgstr ""
msgid "Value Stream Analytics gives an overview of how much time it takes to go from idea to production in your project."
msgid "Value Stream Analytics gives an overview of how much time it takes to go from idea to production in your project."
msgstr ""
msgstr ""
msgid "Value Stream Name"
msgstr ""
msgid "ValueStreamAnalytics|%{days}d"
msgid "ValueStreamAnalytics|%{days}d"
msgstr ""
msgstr ""
...
...
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