summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/clusters
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
committerRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
commit6438df3a1e0fb944485cebf07976160184697d72 (patch)
tree00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/assets/javascripts/clusters
parent42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff)
downloadgitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/clusters')
-rw-r--r--app/assets/javascripts/clusters/clusters_bundle.js28
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue2
-rw-r--r--app/assets/javascripts/clusters/components/fluentd_output_settings.vue2
-rw-r--r--app/assets/javascripts/clusters/forms/stores/index.js2
-rw-r--r--app/assets/javascripts/clusters/stores/clusters_store.js6
-rw-r--r--app/assets/javascripts/clusters/stores/new_cluster/index.js2
6 files changed, 21 insertions, 21 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index a533a1a78e8..eb2128b2856 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -128,7 +128,7 @@ export default class Clusters {
this.initPolling(
'fetchClusterEnvironments',
- data => this.handleClusterEnvironmentsSuccess(data),
+ (data) => this.handleClusterEnvironmentsSuccess(data),
() => this.handleEnvironmentsPollError(),
);
}
@@ -139,7 +139,7 @@ export default class Clusters {
if (statusPath && !this.environments) {
this.initPolling(
'fetchClusterStatus',
- data => this.handleClusterStatusSuccess(data),
+ (data) => this.handleClusterStatusSuccess(data),
() => this.handlePollError(),
);
}
@@ -248,15 +248,15 @@ export default class Clusters {
addListeners() {
eventHub.$on('installApplication', this.installApplication);
- eventHub.$on('updateApplication', data => this.updateApplication(data));
- eventHub.$on('saveKnativeDomain', data => this.saveKnativeDomain(data));
- eventHub.$on('setKnativeDomain', data => this.setKnativeDomain(data));
- eventHub.$on('uninstallApplication', data => this.uninstallApplication(data));
- eventHub.$on('setCrossplaneProviderStack', data => this.setCrossplaneProviderStack(data));
- eventHub.$on('setIngressModSecurityEnabled', data => this.setIngressModSecurityEnabled(data));
- eventHub.$on('setIngressModSecurityMode', data => this.setIngressModSecurityMode(data));
- eventHub.$on('resetIngressModSecurityChanges', id => this.resetIngressModSecurityChanges(id));
- eventHub.$on('setFluentdSettings', data => this.setFluentdSettings(data));
+ eventHub.$on('updateApplication', (data) => this.updateApplication(data));
+ eventHub.$on('saveKnativeDomain', (data) => this.saveKnativeDomain(data));
+ eventHub.$on('setKnativeDomain', (data) => this.setKnativeDomain(data));
+ eventHub.$on('uninstallApplication', (data) => this.uninstallApplication(data));
+ eventHub.$on('setCrossplaneProviderStack', (data) => this.setCrossplaneProviderStack(data));
+ eventHub.$on('setIngressModSecurityEnabled', (data) => this.setIngressModSecurityEnabled(data));
+ eventHub.$on('setIngressModSecurityMode', (data) => this.setIngressModSecurityMode(data));
+ eventHub.$on('resetIngressModSecurityChanges', (id) => this.resetIngressModSecurityChanges(id));
+ eventHub.$on('setFluentdSettings', (data) => this.setFluentdSettings(data));
// Add event listener to all the banner close buttons
this.addBannerCloseHandler(this.unreachableContainer, 'unreachable');
this.addBannerCloseHandler(this.authenticationFailureContainer, 'authentication_failure');
@@ -343,12 +343,12 @@ export default class Clusters {
checkForNewInstalls(prevApplicationMap, newApplicationMap) {
const appTitles = Object.keys(newApplicationMap)
.filter(
- appId =>
+ (appId) =>
newApplicationMap[appId].status === APPLICATION_STATUS.INSTALLED &&
prevApplicationMap[appId].status !== APPLICATION_STATUS.INSTALLED &&
prevApplicationMap[appId].status !== null,
)
- .map(appId => newApplicationMap[appId].title);
+ .map((appId) => newApplicationMap[appId].title);
if (appTitles.length > 0) {
const text = sprintf(
@@ -450,7 +450,7 @@ export default class Clusters {
);
});
})
- .catch(error => this.store.updateAppProperty(appId, 'validationError', error));
+ .catch((error) => this.store.updateAppProperty(appId, 'validationError', error));
}
static validateInstallation(appId, params) {
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index fdffaa24d03..e096a29ce7f 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -461,7 +461,7 @@ export default {
)
"
>
- <template #code="{content}">
+ <template #code="{ content }">
<code>{{ content }}</code>
</template>
<template #link="{ content }">
diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
index b37fc3894f8..84a39874000 100644
--- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
+++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
@@ -127,7 +127,7 @@ export default {
});
},
updateCurrentServerSideSettings(settings) {
- Object.keys(settings).forEach(key => {
+ Object.keys(settings).forEach((key) => {
if (this.currentServerSideSettings[key] === null) {
this.currentServerSideSettings[key] = this[key];
}
diff --git a/app/assets/javascripts/clusters/forms/stores/index.js b/app/assets/javascripts/clusters/forms/stores/index.js
index ae082c07f26..87f1c05fdf9 100644
--- a/app/assets/javascripts/clusters/forms/stores/index.js
+++ b/app/assets/javascripts/clusters/forms/stores/index.js
@@ -4,7 +4,7 @@ import state from './state';
Vue.use(Vuex);
-export const createStore = initialState =>
+export const createStore = (initialState) =>
new Vuex.Store({
state: state(initialState),
});
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index 88505eac3a9..5de487308c5 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -17,7 +17,7 @@ import {
} from '../constants';
import transitionApplicationState from '../services/application_state_machine';
-const isApplicationInstalled = appStatus => APPLICATION_INSTALLED_STATUSES.includes(appStatus);
+const isApplicationInstalled = (appStatus) => APPLICATION_INSTALLED_STATUSES.includes(appStatus);
const applicationInitialState = {
status: null,
@@ -195,7 +195,7 @@ export default class ClusterStore {
this.state.status = serverState.status;
this.state.statusReason = serverState.status_reason;
- serverState.applications.forEach(serverAppEntry => {
+ serverState.applications.forEach((serverAppEntry) => {
const {
name: appId,
status,
@@ -284,7 +284,7 @@ export default class ClusterStore {
}
updateEnvironments(environments = []) {
- this.state.environments = environments.map(environment => ({
+ this.state.environments = environments.map((environment) => ({
name: environment.name,
project: environment.project,
environmentPath: environment.environment_path,
diff --git a/app/assets/javascripts/clusters/stores/new_cluster/index.js b/app/assets/javascripts/clusters/stores/new_cluster/index.js
index ae082c07f26..87f1c05fdf9 100644
--- a/app/assets/javascripts/clusters/stores/new_cluster/index.js
+++ b/app/assets/javascripts/clusters/stores/new_cluster/index.js
@@ -4,7 +4,7 @@ import state from './state';
Vue.use(Vuex);
-export const createStore = initialState =>
+export const createStore = (initialState) =>
new Vuex.Store({
state: state(initialState),
});