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
d0340e41
Commit
d0340e41
authored
Mar 16, 2017
by
Filipa Lacerda
Committed by
Rémy Coutable
Mar 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
20450 fix ujs actions ee
parent
623932ec
Changes
26
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
329 additions
and
173 deletions
+329
-173
app/assets/javascripts/environments/components/environment.js
...assets/javascripts/environments/components/environment.js
+8
-8
app/assets/javascripts/environments/components/environment_actions.js
...avascripts/environments/components/environment_actions.js
+42
-13
app/assets/javascripts/environments/components/environment_external_url.js
...ripts/environments/components/environment_external_url.js
+8
-6
app/assets/javascripts/environments/components/environment_item.js
...s/javascripts/environments/components/environment_item.js
+21
-14
app/assets/javascripts/environments/components/environment_rollback.js
...vascripts/environments/components/environment_rollback.js
+42
-6
app/assets/javascripts/environments/components/environment_stop.js
...s/javascripts/environments/components/environment_stop.js
+40
-9
app/assets/javascripts/environments/components/environment_terminal_button.js
...ts/environments/components/environment_terminal_button.js
+4
-4
app/assets/javascripts/environments/components/environments_table.js
...javascripts/environments/components/environments_table.js
+7
-8
app/assets/javascripts/environments/environments_bundle.js
app/assets/javascripts/environments/environments_bundle.js
+1
-1
app/assets/javascripts/environments/folder/environments_folder_bundle.js
...scripts/environments/folder/environments_folder_bundle.js
+1
-1
app/assets/javascripts/environments/folder/environments_folder_view.js
...vascripts/environments/folder/environments_folder_view.js
+12
-13
app/assets/javascripts/environments/services/environments_service.js
...javascripts/environments/services/environments_service.js
+7
-5
app/assets/javascripts/environments/stores/environments_store.js
...ets/javascripts/environments/stores/environments_store.js
+3
-4
app/assets/javascripts/vue_shared/vue_resource_interceptor.js
...assets/javascripts/vue_shared/vue_resource_interceptor.js
+0
-4
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+8
-0
spec/features/projects/environments/environments_spec.rb
spec/features/projects/environments/environments_spec.rb
+1
-9
spec/javascripts/environments/environment_actions_spec.js
spec/javascripts/environments/environment_actions_spec.js
+23
-12
spec/javascripts/environments/environment_external_url_spec.js
...javascripts/environments/environment_external_url_spec.js
+6
-5
spec/javascripts/environments/environment_item_spec.js
spec/javascripts/environments/environment_item_spec.js
+8
-8
spec/javascripts/environments/environment_rollback_spec.js
spec/javascripts/environments/environment_rollback_spec.js
+27
-15
spec/javascripts/environments/environment_spec.js
spec/javascripts/environments/environment_spec.js
+4
-4
spec/javascripts/environments/environment_stop_spec.js
spec/javascripts/environments/environment_stop_spec.js
+18
-12
spec/javascripts/environments/environment_table_spec.js
spec/javascripts/environments/environment_table_spec.js
+8
-6
spec/javascripts/environments/environment_terminal_button_spec.js
...ascripts/environments/environment_terminal_button_spec.js
+24
-0
spec/javascripts/environments/environments_store_spec.js
spec/javascripts/environments/environments_store_spec.js
+2
-2
spec/javascripts/environments/folder/environments_folder_view_spec.js
...ipts/environments/folder/environments_folder_view_spec.js
+4
-4
No files found.
app/assets/javascripts/environments/components/environment.js
View file @
d0340e41
/* eslint-disable no-param-reassign, no-new */
/* eslint-disable no-param-reassign, no-new */
/* global Flash */
/* global Flash */
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentTable
from
'
./environments_table
'
;
import
EnvironmentsStore
from
'
../stores/environments_store
'
;
const
Vue
=
window
.
Vue
=
require
(
'
vue
'
);
const
Vue
=
window
.
Vue
=
require
(
'
vue
'
);
window
.
Vue
.
use
(
require
(
'
vue-resource
'
));
window
.
Vue
.
use
(
require
(
'
vue-resource
'
));
const
EnvironmentsService
=
require
(
'
~/environments/services/environments_service
'
);
require
(
'
../../vue_shared/components/table_pagination
'
);
const
EnvironmentTable
=
require
(
'
./environments_table
'
);
require
(
'
../../lib/utils/common_utils
'
);
const
EnvironmentsStore
=
require
(
'
~/environments/stores/environments_store
'
);
require
(
'
../../vue_shared/vue_resource_interceptor
'
);
require
(
'
~/vue_shared/components/table_pagination
'
);
require
(
'
~/lib/utils/common_utils
'
);
require
(
'
~/vue_shared/vue_resource_interceptor
'
);
module
.
exports
=
Vue
.
component
(
'
environment-component
'
,
{
export
default
Vue
.
component
(
'
environment-component
'
,
{
components
:
{
components
:
{
'
environment-table
'
:
EnvironmentTable
,
'
environment-table
'
:
EnvironmentTable
,
...
@@ -162,7 +162,7 @@ module.exports = Vue.component('environment-component', {
...
@@ -162,7 +162,7 @@ module.exports = Vue.component('environment-component', {
<div class="content-list environments-container">
<div class="content-list environments-container">
<div class="environments-list-loading text-center" v-if="isLoading">
<div class="environments-list-loading text-center" v-if="isLoading">
<i class="fa fa-spinner fa-spin"></i>
<i class="fa fa-spinner fa-spin"
aria-hidden="true"
></i>
</div>
</div>
<div class="blank-state blank-state-no-icon"
<div class="blank-state blank-state-no-icon"
...
...
app/assets/javascripts/environments/components/environment_actions.js
View file @
d0340e41
const
Vue
=
require
(
'
vue
'
);
/* global Flash */
const
playIconSvg
=
require
(
'
icons/_icon_play.svg
'
);
/* eslint-disable no-new */
module
.
exports
=
Vue
.
component
(
'
actions-component
'
,
{
import
playIconSvg
from
'
icons/_icon_play.svg
'
;
export
default
{
props
:
{
props
:
{
actions
:
{
actions
:
{
type
:
Array
,
type
:
Array
,
required
:
false
,
required
:
false
,
default
:
()
=>
[],
default
:
()
=>
[],
},
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
},
data
()
{
data
()
{
return
{
playIconSvg
};
return
{
playIconSvg
,
isLoading
:
false
,
};
},
methods
:
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
})
.
catch
(()
=>
{
this
.
isLoading
=
false
;
new
Flash
(
'
An error occured while making the request.
'
,
'
alert
'
);
});
},
},
},
template
:
`
template
:
`
<div class="btn-group" role="group">
<div class="btn-group" role="group">
<button class="dropdown btn btn-default dropdown-new" data-toggle="dropdown">
<button
class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container"
data-toggle="dropdown"
:disabled="isLoading">
<span>
<span>
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
<span v-html="playIconSvg"></span>
<i class="fa fa-caret-down"></i>
<i class="fa fa-caret-down" aria-hidden="true"></i>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
</span>
</span>
<ul class="dropdown-menu dropdown-menu-align-right">
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
<li v-for="action in actions">
<a :href="action.play_path"
<button
data-method="post"
@click="onClickAction(action.play_path)"
rel="nofollow"
class="js-manual-action-link no-btn">
class="js-manual-action-link">
${
playIconSvg
}
${
playIconSvg
}
<span>
<span>
{{action.name}}
{{action.name}}
</span>
</span>
</
a
>
</
button
>
</li>
</li>
</ul>
</ul>
</button>
</button>
</div>
</div>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environment_external_url.js
View file @
d0340e41
/**
/**
* Renders the external url link in environments table.
* Renders the external url link in environments table.
*/
*/
const
Vue
=
require
(
'
vue
'
);
export
default
{
module
.
exports
=
Vue
.
component
(
'
external-url-component
'
,
{
props
:
{
props
:
{
externalUrl
:
{
externalUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -12,8 +10,12 @@ module.exports = Vue.component('external-url-component', {
...
@@ -12,8 +10,12 @@ module.exports = Vue.component('external-url-component', {
},
},
template
:
`
template
:
`
<a class="btn external_url" :href="externalUrl" target="_blank">
<a
<i class="fa fa-external-link"></i>
class="btn external_url"
:href="externalUrl"
target="_blank"
title="Environment external URL">
<i class="fa fa-external-link" aria-hidden="true"></i>
</a>
</a>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environment_item.js
View file @
d0340e41
...
@@ -4,20 +4,18 @@
...
@@ -4,20 +4,18 @@
* Renders a table row for each environment.
* Renders a table row for each environment.
*/
*/
const
Vue
=
require
(
'
vue
'
);
import
Timeago
from
'
timeago.js
'
;
const
Timeago
=
require
(
'
timeago.js
'
);
import
ActionsComponent
from
'
./environment_actions
'
;
import
ExternalUrlComponent
from
'
./environment_external_url
'
;
require
(
'
../../lib/utils/text_utility
'
);
import
StopComponent
from
'
./environment_stop
'
;
require
(
'
../../vue_shared/components/commit
'
);
import
RollbackComponent
from
'
./environment_rollback
'
;
const
ActionsComponent
=
require
(
'
./environment_actions
'
);
import
TerminalButtonComponent
from
'
./environment_terminal_button
'
;
const
ExternalUrlComponent
=
require
(
'
./environment_external_url
'
);
import
'
../../lib/utils/text_utility
'
;
const
StopComponent
=
require
(
'
./environment_stop
'
);
import
'
../../vue_shared/components/commit
'
;
const
RollbackComponent
=
require
(
'
./environment_rollback
'
);
const
TerminalButtonComponent
=
require
(
'
./environment_terminal_button
'
);
const
timeagoInstance
=
new
Timeago
();
const
timeagoInstance
=
new
Timeago
();
module
.
exports
=
Vue
.
component
(
'
environment-item
'
,
{
export
default
{
components
:
{
components
:
{
'
commit-component
'
:
gl
.
CommitComponent
,
'
commit-component
'
:
gl
.
CommitComponent
,
...
@@ -51,6 +49,12 @@ module.exports = Vue.component('environment-item', {
...
@@ -51,6 +49,12 @@ module.exports = Vue.component('environment-item', {
type
:
Function
,
type
:
Function
,
required
:
false
,
required
:
false
,
},
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
},
computed
:
{
computed
:
{
...
@@ -509,22 +513,25 @@ module.exports = Vue.component('environment-item', {
...
@@ -509,22 +513,25 @@ module.exports = Vue.component('environment-item', {
<td class="environments-actions">
<td class="environments-actions">
<div v-if="!model.isFolder" class="btn-group pull-right" role="group">
<div v-if="!model.isFolder" class="btn-group pull-right" role="group">
<actions-component v-if="hasManualActions && canCreateDeployment"
<actions-component v-if="hasManualActions && canCreateDeployment"
:service="service"
:actions="manualActions"/>
:actions="manualActions"/>
<external-url-component v-if="externalURL && canReadEnvironment"
<external-url-component v-if="externalURL && canReadEnvironment"
:external-url="externalURL"/>
:external-url="externalURL"/>
<stop-component v-if="hasStopAction && canCreateDeployment"
<stop-component v-if="hasStopAction && canCreateDeployment"
:stop-url="model.stop_path"/>
:stop-url="model.stop_path"
:service="service"/>
<terminal-button-component v-if="model && model.terminal_path"
<terminal-button-component v-if="model && model.terminal_path"
:terminal-path="model.terminal_path"/>
:terminal-path="model.terminal_path"/>
<rollback-component v-if="canRetry && canCreateDeployment"
<rollback-component v-if="canRetry && canCreateDeployment"
:is-last-deployment="isLastDeployment"
:is-last-deployment="isLastDeployment"
:retry-url="retryUrl"/>
:retry-url="retryUrl"
:service="service"/>
</div>
</div>
</td>
</td>
</tr>
</tr>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environment_rollback.js
View file @
d0340e41
/* global Flash */
/* eslint-disable no-new */
/**
/**
* Renders Rollback or Re deploy button in environments table depending
* Renders Rollback or Re deploy button in environments table depending
* of the provided property `isLastDeployment`
* of the provided property `isLastDeployment`.
*
* Makes a post request when the button is clicked.
*/
*/
const
Vue
=
require
(
'
vue
'
);
module
.
exports
=
Vue
.
component
(
'
rollback-component
'
,
{
export
default
{
props
:
{
props
:
{
retryUrl
:
{
retryUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -15,16 +18,49 @@ module.exports = Vue.component('rollback-component', {
...
@@ -15,16 +18,49 @@ module.exports = Vue.component('rollback-component', {
type
:
Boolean
,
type
:
Boolean
,
default
:
true
,
default
:
true
,
},
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
data
()
{
return
{
isLoading
:
false
,
};
},
methods
:
{
onClick
()
{
this
.
isLoading
=
true
;
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
})
.
catch
(()
=>
{
this
.
isLoading
=
false
;
new
Flash
(
'
An error occured while making the request.
'
,
'
alert
'
);
});
},
},
},
template
:
`
template
:
`
<a class="btn" :href="retryUrl" data-method="post" rel="nofollow">
<button type="button"
class="btn"
@click="onClick"
:disabled="isLoading">
<span v-if="isLastDeployment">
<span v-if="isLastDeployment">
Re-deploy
Re-deploy
</span>
</span>
<span v-else>
<span v-else>
Rollback
Rollback
</span>
</span>
</a>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
</button>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environment_stop.js
View file @
d0340e41
/* global Flash */
/* eslint-disable no-new, no-alert */
/**
/**
* Renders the stop "button" that allows stop an environment.
* Renders the stop "button" that allows stop an environment.
* Used in environments table.
* Used in environments table.
*/
*/
const
Vue
=
require
(
'
vue
'
);
module
.
exports
=
Vue
.
component
(
'
stop-component
'
,
{
export
default
{
props
:
{
props
:
{
stopUrl
:
{
stopUrl
:
{
type
:
String
,
type
:
String
,
default
:
''
,
default
:
''
,
},
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
data
()
{
return
{
isLoading
:
false
,
};
},
methods
:
{
onClick
()
{
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
this
.
isLoading
=
true
;
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
})
.
catch
(()
=>
{
this
.
isLoading
=
false
;
new
Flash
(
'
An error occured while making the request.
'
,
'
alert
'
);
});
}
},
},
},
template
:
`
template
:
`
<
a class="btn stop-env-link
"
<
button type="button
"
:href="stopUrl
"
class="btn stop-env-link
"
data-confirm="Are you sure you want to stop this environment?
"
@click="onClick
"
data-method="post
"
:disabled="isLoading
"
rel="nofollow
">
title="Stop Environment
">
<i class="fa fa-stop stop-env-icon" aria-hidden="true"></i>
<i class="fa fa-stop stop-env-icon" aria-hidden="true"></i>
</a>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
</button>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environment_terminal_button.js
View file @
d0340e41
...
@@ -2,10 +2,9 @@
...
@@ -2,10 +2,9 @@
* Renders a terminal button to open a web terminal.
* Renders a terminal button to open a web terminal.
* Used in environments table.
* Used in environments table.
*/
*/
const
Vue
=
require
(
'
vue
'
);
import
terminalIconSvg
from
'
icons/_icon_terminal.svg
'
;
const
terminalIconSvg
=
require
(
'
icons/_icon_terminal.svg
'
);
module
.
exports
=
Vue
.
component
(
'
terminal-button-component
'
,
{
export
default
{
props
:
{
props
:
{
terminalPath
:
{
terminalPath
:
{
type
:
String
,
type
:
String
,
...
@@ -19,8 +18,9 @@ module.exports = Vue.component('terminal-button-component', {
...
@@ -19,8 +18,9 @@ module.exports = Vue.component('terminal-button-component', {
template
:
`
template
:
`
<a class="btn terminal-button"
<a class="btn terminal-button"
title="Open web terminal"
:href="terminalPath">
:href="terminalPath">
${
terminalIconSvg
}
${
terminalIconSvg
}
</a>
</a>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/components/environments_table.js
View file @
d0340e41
...
@@ -4,12 +4,10 @@
...
@@ -4,12 +4,10 @@
* Dumb component used to render top level environments and
* Dumb component used to render top level environments and
* the folder view.
* the folder view.
*/
*/
const
Vue
=
require
(
'
vue
'
);
import
EnvironmentItem
from
'
./environment_item
'
;
const
EnvironmentItem
=
require
(
'
./environment_item
'
);
import
DeployBoard
from
'
./deploy_board_component
'
;
const
DeployBoard
=
require
(
'
./deploy_board_component
'
).
default
;
module
.
exports
=
Vue
.
component
(
'
environment-table-component
'
,
{
export
default
{
components
:
{
components
:
{
EnvironmentItem
,
EnvironmentItem
,
DeployBoard
,
DeployBoard
,
...
@@ -48,7 +46,7 @@ module.exports = Vue.component('environment-table-component', {
...
@@ -48,7 +46,7 @@ module.exports = Vue.component('environment-table-component', {
service
:
{
service
:
{
type
:
Object
,
type
:
Object
,
required
:
fals
e
,
required
:
tru
e
,
default
:
()
=>
({}),
default
:
()
=>
({}),
},
},
},
},
...
@@ -73,7 +71,8 @@ module.exports = Vue.component('environment-table-component', {
...
@@ -73,7 +71,8 @@ module.exports = Vue.component('environment-table-component', {
:model="model"
:model="model"
:can-create-deployment="canCreateDeployment"
:can-create-deployment="canCreateDeployment"
:can-read-environment="canReadEnvironment"
:can-read-environment="canReadEnvironment"
:toggleDeployBoard="toggleDeployBoard"></tr>
:toggleDeployBoard="toggleDeployBoard"
:service="service"></tr>
<tr v-if="model.hasDeployBoard && model.isDeployBoardVisible" class="js-deploy-board-row">
<tr v-if="model.hasDeployBoard && model.isDeployBoardVisible" class="js-deploy-board-row">
<td colspan="6" class="deploy-board-container">
<td colspan="6" class="deploy-board-container">
...
@@ -90,4 +89,4 @@ module.exports = Vue.component('environment-table-component', {
...
@@ -90,4 +89,4 @@ module.exports = Vue.component('environment-table-component', {
</tbody>
</tbody>
</table>
</table>
`
,
`
,
}
)
;
};
app/assets/javascripts/environments/environments_bundle.js
View file @
d0340e41
const
EnvironmentsComponent
=
require
(
'
./components/environment
'
)
;
import
EnvironmentsComponent
from
'
./components/environment
'
;
$
(()
=>
{
$
(()
=>
{
window
.
gl
=
window
.
gl
||
{};
window
.
gl
=
window
.
gl
||
{};
...
...
app/assets/javascripts/environments/folder/environments_folder_bundle.js
View file @
d0340e41
const
EnvironmentsFolderComponent
=
require
(
'
./environments_folder_view
'
)
;
import
EnvironmentsFolderComponent
from
'
./environments_folder_view
'
;
$
(()
=>
{
$
(()
=>
{
window
.
gl
=
window
.
gl
||
{};
window
.
gl
=
window
.
gl
||
{};
...
...
app/assets/javascripts/environments/folder/environments_folder_view.js
View file @
d0340e41
/* eslint-disable no-new */
/* eslint-disable no-param-reassign, no-new */
/* global Flash */
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentTable
from
'
../components/environments_table
'
;
import
EnvironmentsStore
from
'
../stores/environments_store
'
;
const
Flash
=
require
(
'
~/flash
'
);
const
Vue
=
window
.
Vue
=
require
(
'
vue
'
);
const
Vue
=
window
.
Vue
=
require
(
'
vue
'
);
window
.
Vue
.
use
(
require
(
'
vue-resource
'
));
window
.
Vue
.
use
(
require
(
'
vue-resource
'
));
const
EnvironmentsService
=
require
(
'
~/environments//services/environments_service
'
);
require
(
'
../../vue_shared/components/table_pagination
'
);
const
EnvironmentTable
=
require
(
'
~/environments/components/environments_table
'
);
require
(
'
../../lib/utils/common_utils
'
);
const
EnvironmentsStore
=
require
(
'
~/environments//stores/environments_store
'
);
require
(
'
../../vue_shared/vue_resource_interceptor
'
);
const
Flash
=
require
(
'
~/flash
'
);
require
(
'
~/vue_shared/components/table_pagination
'
);
require
(
'
~/lib/utils/common_utils
'
);
require
(
'
~/vue_shared/vue_resource_interceptor
'
);
module
.
exports
=
Vue
.
component
(
'
environment-folder-view
'
,
{
export
default
Vue
.
component
(
'
environment-folder-view
'
,
{
components
:
{
components
:
{
'
environment-table
'
:
EnvironmentTable
,
'
environment-table
'
:
EnvironmentTable
,
...
@@ -183,13 +184,11 @@ module.exports = Vue.component('environment-folder-view', {
...
@@ -183,13 +184,11 @@ module.exports = Vue.component('environment-folder-view', {
:commit-icon-svg="commitIconSvg"
:commit-icon-svg="commitIconSvg"
:toggleDeployBoard="toggleDeployBoard"
:toggleDeployBoard="toggleDeployBoard"
:store="store"
:store="store"
:service="service">
:service="service"/>
</environment-table>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:change="changePage"
:change="changePage"
:pageInfo="state.paginationInformation">
:pageInfo="state.paginationInformation"/>
</table-pagination>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/environments/services/environments_service.js
View file @
d0340e41
/* eslint-disable class-methods-use-this*/
/* eslint-disable class-methods-use-this
*/
const
Vue
=
require
(
'
vue
'
)
;
import
Vue
from
'
vue
'
;
class
EnvironmentsService
{
export
default
class
EnvironmentsService
{
constructor
(
endpoint
)
{
constructor
(
endpoint
)
{
this
.
environments
=
Vue
.
resource
(
endpoint
);
this
.
environments
=
Vue
.
resource
(
endpoint
);
}
}
...
@@ -13,6 +13,8 @@ class EnvironmentsService {
...
@@ -13,6 +13,8 @@ class EnvironmentsService {
getDeployBoard
(
endpoint
)
{
getDeployBoard
(
endpoint
)
{
return
Vue
.
http
.
get
(
endpoint
);
return
Vue
.
http
.
get
(
endpoint
);
}
}
}
module
.
exports
=
EnvironmentsService
;
postAction
(
endpoint
)
{
return
Vue
.
http
.
post
(
endpoint
,
{},
{
emulateJSON
:
true
});
}
}
app/assets/javascripts/environments/stores/environments_store.js
View file @
d0340e41
require
(
'
~/lib/utils/common_utils
'
);
import
'
~/lib/utils/common_utils
'
;
/**
/**
* Environments Store.
* Environments Store.
*
*
* Stores received environments, count of stopped environments and count of
* Stores received environments, count of stopped environments and count of
* available environments.
* available environments.
*/
*/
class
EnvironmentsStore
{
export
default
class
EnvironmentsStore
{
constructor
()
{
constructor
()
{
this
.
state
=
{};
this
.
state
=
{};
this
.
state
.
environments
=
[];
this
.
state
.
environments
=
[];
...
@@ -156,5 +157,3 @@ class EnvironmentsStore {
...
@@ -156,5 +157,3 @@ class EnvironmentsStore {
return
this
.
state
.
environments
;
return
this
.
state
.
environments
;
}
}
}
}
module
.
exports
=
EnvironmentsStore
;
app/assets/javascripts/vue_shared/vue_resource_interceptor.js
View file @
d0340e41
...
@@ -6,10 +6,6 @@ Vue.http.interceptors.push((request, next) => {
...
@@ -6,10 +6,6 @@ Vue.http.interceptors.push((request, next) => {
Vue
.
activeResources
=
Vue
.
activeResources
?
Vue
.
activeResources
+
1
:
1
;
Vue
.
activeResources
=
Vue
.
activeResources
?
Vue
.
activeResources
+
1
:
1
;
next
((
response
)
=>
{
next
((
response
)
=>
{
if
(
typeof
response
.
data
===
'
string
'
)
{
response
.
data
=
JSON
.
parse
(
response
.
data
);
}
Vue
.
activeResources
--
;
Vue
.
activeResources
--
;
});
});
});
});
...
...
app/assets/stylesheets/pages/environments.scss
View file @
d0340e41
...
@@ -141,6 +141,14 @@
...
@@ -141,6 +141,14 @@
margin-right
:
0
;
margin-right
:
0
;
}
}
}
}
.no-btn
{
border
:
none
;
background
:
none
;
outline
:
none
;
width
:
100%
;
text-align
:
left
;
}
}
}
}
}
...
...
spec/features/projects/environments/environments_spec.rb
View file @
d0340e41
...
@@ -111,10 +111,8 @@ feature 'Environments page', :feature, :js do
...
@@ -111,10 +111,8 @@ feature 'Environments page', :feature, :js do
find
(
'.js-dropdown-play-icon-container'
).
click
find
(
'.js-dropdown-play-icon-container'
).
click
expect
(
page
).
to
have_content
(
action
.
name
.
humanize
)
expect
(
page
).
to
have_content
(
action
.
name
.
humanize
)
expect
{
click_link
(
action
.
name
.
humanize
)
}
expect
{
find
(
'.js-manual-action-link'
).
click
}
.
not_to
change
{
Ci
::
Pipeline
.
count
}
.
not_to
change
{
Ci
::
Pipeline
.
count
}
expect
(
action
.
reload
).
to
be_pending
end
end
scenario
'does show build name and id'
do
scenario
'does show build name and id'
do
...
@@ -158,12 +156,6 @@ feature 'Environments page', :feature, :js do
...
@@ -158,12 +156,6 @@ feature 'Environments page', :feature, :js do
expect
(
page
).
to
have_selector
(
'.stop-env-link'
)
expect
(
page
).
to
have_selector
(
'.stop-env-link'
)
end
end
scenario
'starts build when stop button clicked'
do
find
(
'.stop-env-link'
).
click
expect
(
page
).
to
have_content
(
'close_app'
)
end
context
'for reporter'
do
context
'for reporter'
do
let
(
:role
)
{
:reporter
}
let
(
:role
)
{
:reporter
}
...
...
spec/javascripts/environments/environment_actions_spec.js
View file @
d0340e41
const
ActionsComponent
=
require
(
'
~/environments/components/environment_actions
'
);
import
Vue
from
'
vue
'
;
import
actionsComp
from
'
~/environments/components/environment_actions
'
;
describe
(
'
Actions Component
'
,
()
=>
{
describe
(
'
Actions Component
'
,
()
=>
{
preloadFixtures
(
'
static/environments/element.html.raw
'
);
let
ActionsComponent
;
let
actionsMock
;
let
spy
;
let
component
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/element.html.raw
'
);
ActionsComponent
=
Vue
.
extend
(
actionsComp
);
});
it
(
'
should render a dropdown with the provided actions
'
,
()
=>
{
actionsMock
=
[
const
actionsMock
=
[
{
{
name
:
'
bar
'
,
name
:
'
bar
'
,
play_path
:
'
https://gitlab.com/play
'
,
play_path
:
'
https://gitlab.com/play
'
,
...
@@ -19,18 +21,27 @@ describe('Actions Component', () => {
...
@@ -19,18 +21,27 @@ describe('Actions Component', () => {
},
},
];
];
const
component
=
new
ActionsComponent
({
spy
=
jasmine
.
createSpy
(
'
spy
'
).
and
.
returnValue
(
Promise
.
resolve
());
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
component
=
new
ActionsComponent
({
propsData
:
{
propsData
:
{
actions
:
actionsMock
,
actions
:
actionsMock
,
service
:
{
postAction
:
spy
,
},
},
},
}).
$mount
();
});
});
it
(
'
should render a dropdown with the provided actions
'
,
()
=>
{
expect
(
expect
(
component
.
$el
.
querySelectorAll
(
'
.dropdown-menu li
'
).
length
,
component
.
$el
.
querySelectorAll
(
'
.dropdown-menu li
'
).
length
,
).
toEqual
(
actionsMock
.
length
);
).
toEqual
(
actionsMock
.
length
);
expect
(
});
component
.
$el
.
querySelector
(
'
.dropdown-menu li a
'
).
getAttribute
(
'
href
'
),
).
toEqual
(
actionsMock
[
0
].
play_path
);
it
(
'
should call the service when an action is clicked
'
,
()
=>
{
component
.
$el
.
querySelector
(
'
.dropdown
'
).
click
();
component
.
$el
.
querySelector
(
'
.js-manual-action-link
'
).
click
();
expect
(
spy
).
toHaveBeenCalledWith
(
actionsMock
[
0
].
play_path
);
});
});
});
});
spec/javascripts/environments/environment_external_url_spec.js
View file @
d0340e41
const
ExternalUrlComponent
=
require
(
'
~/environments/components/environment_external_url
'
);
import
Vue
from
'
vue
'
;
import
externalUrlComp
from
'
~/environments/components/environment_external_url
'
;
describe
(
'
External URL Component
'
,
()
=>
{
describe
(
'
External URL Component
'
,
()
=>
{
preloadFixtures
(
'
static/environments/element.html.raw
'
);
let
ExternalUrlComponent
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/element.html.raw
'
);
ExternalUrlComponent
=
Vue
.
extend
(
externalUrlComp
);
});
});
it
(
'
should link to the provided externalUrl prop
'
,
()
=>
{
it
(
'
should link to the provided externalUrl prop
'
,
()
=>
{
const
externalURL
=
'
https://gitlab.com
'
;
const
externalURL
=
'
https://gitlab.com
'
;
const
component
=
new
ExternalUrlComponent
({
const
component
=
new
ExternalUrlComponent
({
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
propsData
:
{
propsData
:
{
externalUrl
:
externalURL
,
externalUrl
:
externalURL
,
},
},
});
})
.
$mount
()
;
expect
(
component
.
$el
.
getAttribute
(
'
href
'
)).
toEqual
(
externalURL
);
expect
(
component
.
$el
.
getAttribute
(
'
href
'
)).
toEqual
(
externalURL
);
expect
(
component
.
$el
.
querySelector
(
'
fa-external-link
'
)).
toBeDefined
();
expect
(
component
.
$el
.
querySelector
(
'
fa-external-link
'
)).
toBeDefined
();
...
...
spec/javascripts/environments/environment_item_spec.js
View file @
d0340e41
window
.
timeago
=
require
(
'
timeago.js
'
);
import
'
timeago.js
'
;
const
EnvironmentItem
=
require
(
'
~/environments/components/environment_item
'
);
import
Vue
from
'
vue
'
;
import
environmentItemComp
from
'
~/environments/components/environment_item
'
;
describe
(
'
Environment item
'
,
()
=>
{
describe
(
'
Environment item
'
,
()
=>
{
preloadFixtures
(
'
static/environments/table.html.raw
'
);
let
EnvironmentItem
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/table.html.raw
'
);
EnvironmentItem
=
Vue
.
extend
(
environmentItemComp
);
});
});
describe
(
'
When item is folder
'
,
()
=>
{
describe
(
'
When item is folder
'
,
()
=>
{
...
@@ -21,7 +23,6 @@ describe('Environment item', () => {
...
@@ -21,7 +23,6 @@ describe('Environment item', () => {
};
};
component
=
new
EnvironmentItem
({
component
=
new
EnvironmentItem
({
el
:
document
.
querySelector
(
'
tr#environment-row
'
),
propsData
:
{
propsData
:
{
model
:
mockItem
,
model
:
mockItem
,
canCreateDeployment
:
false
,
canCreateDeployment
:
false
,
...
@@ -30,7 +31,7 @@ describe('Environment item', () => {
...
@@ -30,7 +31,7 @@ describe('Environment item', () => {
store
:
{},
store
:
{},
service
:
{},
service
:
{},
},
},
});
})
.
$mount
()
;
});
});
it
(
'
Should render folder icon and name
'
,
()
=>
{
it
(
'
Should render folder icon and name
'
,
()
=>
{
...
@@ -112,7 +113,6 @@ describe('Environment item', () => {
...
@@ -112,7 +113,6 @@ describe('Environment item', () => {
};
};
component
=
new
EnvironmentItem
({
component
=
new
EnvironmentItem
({
el
:
document
.
querySelector
(
'
tr#environment-row
'
),
propsData
:
{
propsData
:
{
model
:
environment
,
model
:
environment
,
canCreateDeployment
:
true
,
canCreateDeployment
:
true
,
...
@@ -121,7 +121,7 @@ describe('Environment item', () => {
...
@@ -121,7 +121,7 @@ describe('Environment item', () => {
store
:
{},
store
:
{},
service
:
{},
service
:
{},
},
},
});
})
.
$mount
()
;
});
});
it
(
'
should render environment name
'
,
()
=>
{
it
(
'
should render environment name
'
,
()
=>
{
...
...
spec/javascripts/environments/environment_rollback_spec.js
View file @
d0340e41
const
RollbackComponent
=
require
(
'
~/environments/components/environment_rollback
'
);
import
Vue
from
'
vue
'
;
import
rollbackComp
from
'
~/environments/components/environment_rollback
'
;
describe
(
'
Rollback Component
'
,
()
=>
{
describe
(
'
Rollback Component
'
,
()
=>
{
preloadFixtures
(
'
static/environments/element.html.raw
'
);
const
retryURL
=
'
https://gitlab.com/retry
'
;
const
retryURL
=
'
https://gitlab.com/retry
'
;
let
RollbackComponent
;
let
spy
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/element.html.raw
'
);
RollbackComponent
=
Vue
.
extend
(
rollbackComp
);
spy
=
jasmine
.
createSpy
(
'
spy
'
).
and
.
returnValue
(
Promise
.
resolve
());
});
});
it
(
'
Should
link to the provided retryUrl
'
,
()
=>
{
it
(
'
Should
render Re-deploy label when isLastDeployment is true
'
,
()
=>
{
const
component
=
new
RollbackComponent
({
const
component
=
new
RollbackComponent
({
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
propsData
:
{
propsData
:
{
retryUrl
:
retryURL
,
retryUrl
:
retryURL
,
isLastDeployment
:
true
,
isLastDeployment
:
true
,
service
:
{
postAction
:
spy
,
},
},
});
},
}).
$mount
();
expect
(
component
.
$el
.
getAttribute
(
'
href
'
)).
toEqual
(
retryURL
);
expect
(
component
.
$el
.
querySelector
(
'
span
'
).
textContent
).
toContain
(
'
Re-deploy
'
);
});
});
it
(
'
Should render R
e-deploy label when isLastDeployment is tru
e
'
,
()
=>
{
it
(
'
Should render R
ollback label when isLastDeployment is fals
e
'
,
()
=>
{
const
component
=
new
RollbackComponent
({
const
component
=
new
RollbackComponent
({
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
propsData
:
{
propsData
:
{
retryUrl
:
retryURL
,
retryUrl
:
retryURL
,
isLastDeployment
:
true
,
isLastDeployment
:
false
,
service
:
{
postAction
:
spy
,
},
},
});
},
}).
$mount
();
expect
(
component
.
$el
.
querySelector
(
'
span
'
).
textContent
).
toContain
(
'
R
e-deploy
'
);
expect
(
component
.
$el
.
querySelector
(
'
span
'
).
textContent
).
toContain
(
'
R
ollback
'
);
});
});
it
(
'
Should render Rollback label when isLastDeployment is false
'
,
()
=>
{
it
(
'
should call the service when the button is clicked
'
,
()
=>
{
const
component
=
new
RollbackComponent
({
const
component
=
new
RollbackComponent
({
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
propsData
:
{
propsData
:
{
retryUrl
:
retryURL
,
retryUrl
:
retryURL
,
isLastDeployment
:
false
,
isLastDeployment
:
false
,
service
:
{
postAction
:
spy
,
},
},
});
},
}).
$mount
();
expect
(
component
.
$el
.
querySelector
(
'
span
'
).
textContent
).
toContain
(
'
Rollback
'
);
component
.
$el
.
click
();
expect
(
spy
).
toHaveBeenCalledWith
(
retryURL
);
});
});
});
});
spec/javascripts/environments/environment_spec.js
View file @
d0340e41
const
Vue
=
require
(
'
vue
'
)
;
import
Vue
from
'
vue
'
;
require
(
'
~/flash
'
)
;
import
'
~/flash
'
;
const
EnvironmentsComponent
=
require
(
'
~/environments/components/environment
'
)
;
import
EnvironmentsComponent
from
'
~/environments/components/environment
'
;
const
{
environment
}
=
require
(
'
./mock_data
'
)
;
import
{
environment
}
from
'
./mock_data
'
;
describe
(
'
Environment
'
,
()
=>
{
describe
(
'
Environment
'
,
()
=>
{
preloadFixtures
(
'
static/environments/environments.html.raw
'
);
preloadFixtures
(
'
static/environments/environments.html.raw
'
);
...
...
spec/javascripts/environments/environment_stop_spec.js
View file @
d0340e41
const
StopComponent
=
require
(
'
~/environments/components/environment_stop
'
);
import
Vue
from
'
vue
'
;
import
stopComp
from
'
~/environments/components/environment_stop
'
;
describe
(
'
Stop Component
'
,
()
=>
{
describe
(
'
Stop Component
'
,
()
=>
{
preloadFixtures
(
'
static/environments/element.html.raw
'
);
let
StopComponent
;
let
stopURL
;
let
component
;
let
component
;
let
spy
;
const
stopURL
=
'
/stop
'
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/element.html.raw
'
);
StopComponent
=
Vue
.
extend
(
stopComp
);
spy
=
jasmine
.
createSpy
(
'
spy
'
).
and
.
returnValue
(
Promise
.
resolve
());
spyOn
(
window
,
'
confirm
'
).
and
.
returnValue
(
true
);
stopURL
=
'
/stop
'
;
component
=
new
StopComponent
({
component
=
new
StopComponent
({
el
:
document
.
querySelector
(
'
.test-dom-element
'
),
propsData
:
{
propsData
:
{
stopUrl
:
stopURL
,
stopUrl
:
stopURL
,
service
:
{
postAction
:
spy
,
},
},
});
},
}).
$mount
();
});
});
it
(
'
should link to the provided URL
'
,
()
=>
{
it
(
'
should render a button to stop the environment
'
,
()
=>
{
expect
(
component
.
$el
.
getAttribute
(
'
href
'
)).
toEqual
(
stopURL
);
expect
(
component
.
$el
.
tagName
).
toEqual
(
'
BUTTON
'
);
expect
(
component
.
$el
.
getAttribute
(
'
title
'
)).
toEqual
(
'
Stop Environment
'
);
});
});
it
(
'
should have a data-confirm attribute
'
,
()
=>
{
it
(
'
should call the service when an action is clicked
'
,
()
=>
{
expect
(
component
.
$el
.
getAttribute
(
'
data-confirm
'
)).
toEqual
(
'
Are you sure you want to stop this environment?
'
);
component
.
$el
.
click
();
expect
(
spy
).
toHaveBeenCalled
();
});
});
});
});
spec/javascripts/environments/environment_table_spec.js
View file @
d0340e41
const
EnvironmentTable
=
require
(
'
~/environments/components/environments_table
'
);
import
Vue
from
'
vue
'
;
import
environmentTableComp
from
'
~/environments/components/environments_table
'
;
describe
(
'
Environment item
'
,
()
=>
{
describe
(
'
Environment item
'
,
()
=>
{
preloadFixtures
(
'
static/environments/element.html.raw
'
);
let
EnvironmentTable
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/environments/element.html.raw
'
);
EnvironmentTable
=
Vue
.
extend
(
environmentTableComp
);
});
});
it
(
'
Should render a table
'
,
()
=>
{
it
(
'
Should render a table
'
,
()
=>
{
...
@@ -25,7 +27,7 @@ describe('Environment item', () => {
...
@@ -25,7 +27,7 @@ describe('Environment item', () => {
store
:
{},
store
:
{},
service
:
{},
service
:
{},
},
},
});
})
.
$mount
()
;
expect
(
component
.
$el
.
tagName
).
toEqual
(
'
TABLE
'
);
expect
(
component
.
$el
.
tagName
).
toEqual
(
'
TABLE
'
);
});
});
...
@@ -60,7 +62,7 @@ describe('Environment item', () => {
...
@@ -60,7 +62,7 @@ describe('Environment item', () => {
store
:
{},
store
:
{},
service
:
{},
service
:
{},
},
},
});
})
.
$mount
()
;
expect
(
component
.
$el
.
querySelector
(
'
.js-deploy-board-row
'
)).
toBeDefined
();
expect
(
component
.
$el
.
querySelector
(
'
.js-deploy-board-row
'
)).
toBeDefined
();
expect
(
expect
(
...
@@ -100,7 +102,7 @@ describe('Environment item', () => {
...
@@ -100,7 +102,7 @@ describe('Environment item', () => {
store
:
{},
store
:
{},
service
:
{},
service
:
{},
},
},
});
})
.
$mount
()
;
component
.
$el
.
querySelector
(
'
.deploy-board-icon
'
).
click
();
component
.
$el
.
querySelector
(
'
.deploy-board-icon
'
).
click
();
...
...
spec/javascripts/environments/environment_terminal_button_spec.js
0 → 100644
View file @
d0340e41
import
Vue
from
'
vue
'
;
import
terminalComp
from
'
~/environments/components/environment_terminal_button
'
;
describe
(
'
Stop Component
'
,
()
=>
{
let
TerminalComponent
;
let
component
;
const
terminalPath
=
'
/path
'
;
beforeEach
(()
=>
{
TerminalComponent
=
Vue
.
extend
(
terminalComp
);
component
=
new
TerminalComponent
({
propsData
:
{
terminalPath
,
},
}).
$mount
();
});
it
(
'
should render a link to open a web terminal with the provided path
'
,
()
=>
{
expect
(
component
.
$el
.
tagName
).
toEqual
(
'
A
'
);
expect
(
component
.
$el
.
getAttribute
(
'
title
'
)).
toEqual
(
'
Open web terminal
'
);
expect
(
component
.
$el
.
getAttribute
(
'
href
'
)).
toEqual
(
terminalPath
);
});
});
spec/javascripts/environments/environments_store_spec.js
View file @
d0340e41
const
Store
=
require
(
'
~/environments/stores/environments_store
'
)
;
import
Store
from
'
~/environments/stores/environments_store
'
;
const
{
serverData
,
deployBoardMockData
}
=
require
(
'
./mock_data
'
)
;
import
{
serverData
,
deployBoardMockData
}
from
'
./mock_data
'
;
(()
=>
{
(()
=>
{
describe
(
'
Environments Store
'
,
()
=>
{
describe
(
'
Environments Store
'
,
()
=>
{
...
...
spec/javascripts/environments/folder/environments_folder_view_spec.js
View file @
d0340e41
const
Vue
=
require
(
'
vue
'
)
;
import
Vue
from
'
vue
'
;
require
(
'
~/flash
'
)
;
import
'
~/flash
'
;
const
EnvironmentsFolderViewComponent
=
require
(
'
~/environments/folder/environments_folder_view
'
)
;
import
EnvironmentsFolderViewComponent
from
'
~/environments/folder/environments_folder_view
'
;
const
{
environmentsList
}
=
require
(
'
../mock_data
'
)
;
import
{
environmentsList
}
from
'
../mock_data
'
;
describe
(
'
Environments Folder View
'
,
()
=>
{
describe
(
'
Environments Folder View
'
,
()
=>
{
preloadFixtures
(
'
static/environments/environments_folder_view.html.raw
'
);
preloadFixtures
(
'
static/environments/environments_folder_view.html.raw
'
);
...
...
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