Changes after review
This commit is contained in:
parent
62545ddb2c
commit
7d8e410ffe
|
@ -39,6 +39,7 @@ export default class Clusters {
|
||||||
this.errorContainer = document.querySelector('.js-cluster-error');
|
this.errorContainer = document.querySelector('.js-cluster-error');
|
||||||
this.successContainer = document.querySelector('.js-cluster-success');
|
this.successContainer = document.querySelector('.js-cluster-success');
|
||||||
this.creatingContainer = document.querySelector('.js-cluster-creating');
|
this.creatingContainer = document.querySelector('.js-cluster-creating');
|
||||||
|
this.errorReasonContainer = this.errorContainer.querySelector('.js-error-reason');
|
||||||
|
|
||||||
this.toggleButton.addEventListener('click', this.toggle.bind(this));
|
this.toggleButton.addEventListener('click', this.toggle.bind(this));
|
||||||
|
|
||||||
|
@ -47,7 +48,7 @@ export default class Clusters {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.state.statusPath) {
|
if (this.state.statusPath) {
|
||||||
this.initPoling();
|
this.initPolling();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +57,7 @@ export default class Clusters {
|
||||||
this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
|
this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
initPoling() {
|
initPolling() {
|
||||||
this.poll = new Poll({
|
this.poll = new Poll({
|
||||||
resource: this.service,
|
resource: this.service,
|
||||||
method: 'fetchData',
|
method: 'fetchData',
|
||||||
|
@ -98,7 +99,7 @@ export default class Clusters {
|
||||||
break;
|
break;
|
||||||
case 'errored':
|
case 'errored':
|
||||||
this.errorContainer.classList.remove('hidden');
|
this.errorContainer.classList.remove('hidden');
|
||||||
this.errorContainer.querySelector('.js-error-reason').textContent = error;
|
this.errorReasonContainer.textContent = error;
|
||||||
break;
|
break;
|
||||||
case 'scheduled':
|
case 'scheduled':
|
||||||
case 'creating':
|
case 'creating':
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
.col-lg-8
|
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
= s_('ClusterIntegration|Create new cluster on Google Container Engine')
|
= s_('ClusterIntegration|Create new cluster on Google Container Engine')
|
||||||
%p
|
%p
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
.col-sm-4
|
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
= s_('ClusterIntegration|Cluster integration')
|
= s_('ClusterIntegration|Cluster integration')
|
||||||
%p
|
%p
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
|
.col-sm-4
|
||||||
= render 'sidebar'
|
= render 'sidebar'
|
||||||
|
.col-sm-8
|
||||||
= render 'header'
|
= render 'header'
|
||||||
.row
|
.row
|
||||||
.col-sm-8.col-sm-offset-4
|
.col-sm-8.col-sm-offset-4
|
||||||
- if @authorize_url
|
- if @authorize_url
|
||||||
%a{ href: @authorize_url }
|
= link_to @authorize_url do
|
||||||
= image_tag('auth_buttons/signin_with_google.png')
|
= image_tag('auth_buttons/signin_with_google.png')
|
||||||
- else
|
- else
|
||||||
- link = link_to(s_('ClusterIntegration|properly configured'), help_page_path("integration/google"), target: '_blank', rel: 'noopener noreferrer')
|
- link = link_to(s_('ClusterIntegration|properly configured'), help_page_path("integration/google"), target: '_blank', rel: 'noopener noreferrer')
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
|
.col-sm-4
|
||||||
= render 'sidebar'
|
= render 'sidebar'
|
||||||
|
.col-sm-8
|
||||||
= render 'header'
|
= render 'header'
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
|
@ -3,8 +3,9 @@
|
||||||
toggle_status: @cluster.enabled? ? 'true': 'false',
|
toggle_status: @cluster.enabled? ? 'true': 'false',
|
||||||
cluster_status: @cluster.status_name,
|
cluster_status: @cluster.status_name,
|
||||||
cluster_status_reason: @cluster.status_reason }}
|
cluster_status_reason: @cluster.status_reason }}
|
||||||
|
.col-sm-4
|
||||||
= render 'sidebar'
|
= render 'sidebar'
|
||||||
.col-lg-8
|
.col-sm-8
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
= s_('ClusterIntegration|Enable cluster integration')
|
= s_('ClusterIntegration|Enable cluster integration')
|
||||||
%p
|
%p
|
||||||
|
@ -24,7 +25,7 @@
|
||||||
|
|
||||||
%button{ type: 'button',
|
%button{ type: 'button',
|
||||||
class: "js-toggle-cluster project-feature-toggle #{'checked' unless !@cluster.enabled?} #{'disabled' unless can?(current_user, :update_cluster, @cluster)}",
|
class: "js-toggle-cluster project-feature-toggle #{'checked' unless !@cluster.enabled?} #{'disabled' unless can?(current_user, :update_cluster, @cluster)}",
|
||||||
'aria-label': 'Toggle',
|
'aria-label': s_('ClusterIntegration|Toggle Cluster'),
|
||||||
disabled: !can?(current_user, :update_cluster, @cluster),
|
disabled: !can?(current_user, :update_cluster, @cluster),
|
||||||
data: { 'enabled-text': 'Enabled', 'disabled-text': 'Disabled' } }
|
data: { 'enabled-text': 'Enabled', 'disabled-text': 'Disabled' } }
|
||||||
|
|
||||||
|
@ -50,7 +51,7 @@
|
||||||
= s_('ClusterIntegration|Cluster was successfully created on Google Container Engine.')
|
= s_('ClusterIntegration|Cluster was successfully created on Google Container Engine.')
|
||||||
|
|
||||||
.form_group
|
.form_group
|
||||||
%label
|
%label{ for: 'cluter_name' }
|
||||||
= s_('ClusterIntegration|Cluster name')
|
= s_('ClusterIntegration|Cluster name')
|
||||||
.input-group
|
.input-group
|
||||||
%input.form-control{ value: @cluster.gcp_cluster_name, disabled: true}
|
%input.form-control{ value: @cluster.gcp_cluster_name, disabled: true}
|
||||||
|
|
|
@ -29,14 +29,14 @@ describe('Clusters', () => {
|
||||||
cluster.updateContainer('creating');
|
cluster.updateContainer('creating');
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
cluster.creatingContainer.classList,
|
cluster.creatingContainer.classList.contains('hidden'),
|
||||||
).not.toContain('hidden');
|
).toBeFalsy();
|
||||||
expect(
|
expect(
|
||||||
cluster.successContainer.classList,
|
cluster.successContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
expect(
|
expect(
|
||||||
cluster.errorContainer.classList,
|
cluster.errorContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -45,14 +45,14 @@ describe('Clusters', () => {
|
||||||
cluster.updateContainer('created');
|
cluster.updateContainer('created');
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
cluster.creatingContainer.classList,
|
cluster.creatingContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
expect(
|
expect(
|
||||||
cluster.successContainer.classList,
|
cluster.successContainer.classList.contains('hidden'),
|
||||||
).not.toContain('hidden');
|
).toBeFalsy();
|
||||||
expect(
|
expect(
|
||||||
cluster.errorContainer.classList,
|
cluster.errorContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -61,17 +61,17 @@ describe('Clusters', () => {
|
||||||
cluster.updateContainer('errored', 'this is an error');
|
cluster.updateContainer('errored', 'this is an error');
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
cluster.creatingContainer.classList,
|
cluster.creatingContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
expect(
|
expect(
|
||||||
cluster.successContainer.classList,
|
cluster.successContainer.classList.contains('hidden'),
|
||||||
).toContain('hidden');
|
).toBeTruthy();
|
||||||
expect(
|
expect(
|
||||||
cluster.errorContainer.classList,
|
cluster.errorContainer.classList.contains('hidden'),
|
||||||
).not.toContain('hidden');
|
).toBeFalsy();
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
cluster.errorContainer.querySelector('.js-error-reason').textContent,
|
cluster.errorReasonContainer.textContent,
|
||||||
).toContain('this is an error');
|
).toContain('this is an error');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue