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
0c91003e
Commit
0c91003e
authored
Jun 17, 2019
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FE: Add hasLegacyAppLabel property to envs store
parent
fa22bd92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+1
-0
ee/app/assets/javascripts/environments/stores/helpers.js
ee/app/assets/javascripts/environments/stores/helpers.js
+1
-0
ee/spec/javascripts/environments/environments_store_spec.js
ee/spec/javascripts/environments/environments_store_spec.js
+20
-0
No files found.
app/assets/javascripts/environments/components/environments_table.vue
View file @
0c91003e
...
...
@@ -108,6 +108,7 @@ export default {
:deploy-board-data=
"model.deployBoardData"
:is-loading=
"model.isLoadingDeployBoard"
:is-empty=
"model.isEmptyDeployBoard"
:has-legacy-app-label=
"model.hasLegacyAppLabel"
:logs-path=
"model.logs_path"
/>
</div>
...
...
ee/app/assets/javascripts/environments/stores/helpers.js
View file @
0c91003e
...
...
@@ -24,6 +24,7 @@ export const setDeployBoard = (oldEnvironmentState, environment) => {
environment
.
rollout_status
.
status
===
'
found
'
?
environment
.
rollout_status
:
{},
isLoadingDeployBoard
:
environment
.
rollout_status
.
status
===
'
loading
'
,
isEmptyDeployBoard
:
environment
.
rollout_status
.
status
===
'
not_found
'
,
hasLegacyAppLabel
:
environment
.
rollout_status
.
has_legacy_app_label
,
});
}
return
parsedEnvironment
;
...
...
ee/spec/javascripts/environments/environments_store_spec.js
View file @
0c91003e
...
...
@@ -60,6 +60,26 @@ describe('Store', () => {
expect
(
store
.
state
.
environments
[
0
].
deployBoardData
).
toEqual
(
deployBoardMockData
);
});
it
(
'
should set hasLegacyAppLabel property
'
,
()
=>
{
expect
(
store
.
state
.
environments
[
0
].
deployBoardData
).
toEqual
(
deployBoardMockData
);
const
environment
=
{
name
:
'
foo
'
,
size
:
1
,
latest
:
{
id
:
1
,
},
rollout_status
:
{
...
deployBoardMockData
,
status
:
'
not_found
'
,
has_legacy_app_label
:
true
,
},
};
store
.
storeEnvironments
([
environment
]);
expect
(
store
.
state
.
environments
[
0
].
hasLegacyAppLabel
).
toBe
(
true
);
});
});
describe
(
'
canaryCallout
'
,
()
=>
{
...
...
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