diff options
Diffstat (limited to 'app/assets/javascripts/clusters/components')
6 files changed, 65 insertions, 62 deletions
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index 471c1a0b4a2..76fe076d4ff 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -1,14 +1,13 @@ <script> import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/ui'; import { s__, __, sprintf } from '~/locale'; -import eventHub from '../event_hub'; import identicon from '../../vue_shared/components/identicon.vue'; +import { APPLICATION_STATUS, ELASTIC_STACK } from '../constants'; +import eventHub from '../event_hub'; import UninstallApplicationButton from './uninstall_application_button.vue'; import UninstallApplicationConfirmationModal from './uninstall_application_confirmation_modal.vue'; import UpdateApplicationConfirmationModal from './update_application_confirmation_modal.vue'; -import { APPLICATION_STATUS, ELASTIC_STACK } from '../constants'; - export default { components: { GlButton, diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index e096a29ce7f..8ef3169dc65 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -1,23 +1,23 @@ <script> import { GlLoadingIcon, GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; +import certManagerLogo from 'images/cluster_app_logos/cert_manager.png'; +import crossplaneLogo from 'images/cluster_app_logos/crossplane.png'; +import elasticStackLogo from 'images/cluster_app_logos/elastic_stack.png'; +import fluentdLogo from 'images/cluster_app_logos/fluentd.png'; import gitlabLogo from 'images/cluster_app_logos/gitlab.png'; import helmLogo from 'images/cluster_app_logos/helm.png'; import jupyterhubLogo from 'images/cluster_app_logos/jupyterhub.png'; -import kubernetesLogo from 'images/cluster_app_logos/kubernetes.png'; -import certManagerLogo from 'images/cluster_app_logos/cert_manager.png'; -import crossplaneLogo from 'images/cluster_app_logos/crossplane.png'; import knativeLogo from 'images/cluster_app_logos/knative.png'; +import kubernetesLogo from 'images/cluster_app_logos/kubernetes.png'; import prometheusLogo from 'images/cluster_app_logos/prometheus.png'; -import elasticStackLogo from 'images/cluster_app_logos/elastic_stack.png'; -import fluentdLogo from 'images/cluster_app_logos/fluentd.png'; -import applicationRow from './application_row.vue'; +import eventHub from '~/clusters/event_hub'; import clipboardButton from '../../vue_shared/components/clipboard_button.vue'; -import KnativeDomainEditor from './knative_domain_editor.vue'; import { CLUSTER_TYPE, PROVIDER_TYPE, APPLICATION_STATUS, INGRESS } from '../constants'; -import eventHub from '~/clusters/event_hub'; +import applicationRow from './application_row.vue'; import CrossplaneProviderStack from './crossplane_provider_stack.vue'; -import IngressModsecuritySettings from './ingress_modsecurity_settings.vue'; import FluentdOutputSettings from './fluentd_output_settings.vue'; +import IngressModsecuritySettings from './ingress_modsecurity_settings.vue'; +import KnativeDomainEditor from './knative_domain_editor.vue'; export default { components: { @@ -349,6 +349,7 @@ export default { {{ s__('ClusterIntegration|Issuer Email') }} </label> <div class="input-group"> + <!-- eslint-disable vue/no-mutating-props --> <input id="cert-manager-issuer-email" v-model="applications.cert_manager.email" @@ -356,6 +357,7 @@ export default { type="text" class="form-control js-email" /> + <!-- eslint-enable vue/no-mutating-props --> </div> <p class="form-text text-muted"> {{ @@ -522,6 +524,7 @@ export default { <label for="jupyter-hostname">{{ s__('ClusterIntegration|Jupyter Hostname') }}</label> <div class="input-group"> + <!-- eslint-disable vue/no-mutating-props --> <input id="jupyter-hostname" v-model="applications.jupyter.hostname" @@ -529,6 +532,7 @@ export default { type="text" class="form-control js-hostname" /> + <!-- eslint-enable vue/no-mutating-props --> <span class="input-group-append"> <clipboard-button :text="jupyterHostname" diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue index 84a39874000..369cb2fa0f3 100644 --- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue +++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue @@ -1,9 +1,9 @@ <script> import { GlAlert, GlButton, GlDropdown, GlDropdownItem, GlFormCheckbox } from '@gitlab/ui'; import { mapValues } from 'lodash'; -import { __ } from '~/locale'; import { APPLICATION_STATUS, FLUENTD } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; +import { __ } from '~/locale'; const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS; diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue index f05c8db5d56..26767c32275 100644 --- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue +++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue @@ -1,5 +1,4 @@ <script> -import { escape } from 'lodash'; import { GlAlert, GlSprintf, @@ -10,10 +9,11 @@ import { GlDropdownItem, GlIcon, } from '@gitlab/ui'; +import { escape } from 'lodash'; import modSecurityLogo from 'images/cluster_app_logos/gitlab.png'; -import { s__, __ } from '../../locale'; import { APPLICATION_STATUS, INGRESS, LOGGING_MODE, BLOCKING_MODE } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; +import { s__, __ } from '../../locale'; const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS; @@ -130,9 +130,11 @@ export default { }, resetStatus() { if (this.initialMode !== null) { + // eslint-disable-next-line vue/no-mutating-props this.ingress.modsecurity_mode = this.initialMode; } if (this.initialValue !== null) { + // eslint-disable-next-line vue/no-mutating-props this.ingress.modsecurity_enabled = this.initialValue; } this.initialValue = null; diff --git a/app/assets/javascripts/clusters/components/knative_domain_editor.vue b/app/assets/javascripts/clusters/components/knative_domain_editor.vue index d80bd6f5b42..89446680173 100644 --- a/app/assets/javascripts/clusters/components/knative_domain_editor.vue +++ b/app/assets/javascripts/clusters/components/knative_domain_editor.vue @@ -9,10 +9,10 @@ import { GlButton, GlAlert, } from '@gitlab/ui'; -import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; +import { APPLICATION_STATUS } from '~/clusters/constants'; import { __, s__ } from '~/locale'; -import { APPLICATION_STATUS } from '~/clusters/constants'; +import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; const { UPDATING, UNINSTALLING } = APPLICATION_STATUS; diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index c157b04b4f5..5cd9baf2c2b 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/no-v-html */ -import { escape } from 'lodash'; import { GlModal, GlButton, GlFormInput, GlSprintf } from '@gitlab/ui'; -import SplitButton from '~/vue_shared/components/split_button.vue'; -import { s__, sprintf } from '~/locale'; +import { escape } from 'lodash'; import csrf from '~/lib/utils/csrf'; +import { s__, sprintf } from '~/locale'; +import SplitButton from '~/vue_shared/components/split_button.vue'; const splitButtonActionItems = [ { @@ -131,48 +131,46 @@ export default { :title="modalTitle" kind="danger" > - <template> - <p>{{ warningMessage }}</p> - <div v-if="confirmCleanup"> - {{ s__('ClusterIntegration|This will permanently delete the following resources:') }} - <ul> - <li> - {{ s__('ClusterIntegration|All installed applications and related resources') }} - </li> - <li> - <gl-sprintf :message="s__('ClusterIntegration|The %{gitlabNamespace} namespace')"> - <template #gitlabNamespace> - <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> - <code>{{ 'gitlab-managed-apps' }}</code> - </template> - </gl-sprintf> - </li> - <li>{{ s__('ClusterIntegration|Any project namespaces') }}</li> - <!-- eslint-disable @gitlab/vue-require-i18n-strings --> - <li><code>clusterroles</code></li> - <li><code>clusterrolebindings</code></li> - <!-- eslint-enable @gitlab/vue-require-i18n-strings --> - </ul> - </div> - <strong v-html="confirmationTextLabel"></strong> - <form ref="form" :action="clusterPath" method="post" class="gl-mb-5"> - <input ref="method" type="hidden" name="_method" value="delete" /> - <input :value="csrfToken" type="hidden" name="authenticity_token" /> - <input ref="cleanup" type="hidden" name="cleanup" value="true" /> - <gl-form-input - v-model="enteredClusterName" - autofocus - type="text" - name="confirm_cluster_name_input" - autocomplete="off" - /> - </form> - <span v-if="confirmCleanup">{{ - s__( - 'ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration.', - ) - }}</span> - </template> + <p>{{ warningMessage }}</p> + <div v-if="confirmCleanup"> + {{ s__('ClusterIntegration|This will permanently delete the following resources:') }} + <ul> + <li> + {{ s__('ClusterIntegration|All installed applications and related resources') }} + </li> + <li> + <gl-sprintf :message="s__('ClusterIntegration|The %{gitlabNamespace} namespace')"> + <template #gitlabNamespace> + <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> + <code>{{ 'gitlab-managed-apps' }}</code> + </template> + </gl-sprintf> + </li> + <li>{{ s__('ClusterIntegration|Any project namespaces') }}</li> + <!-- eslint-disable @gitlab/vue-require-i18n-strings --> + <li><code>clusterroles</code></li> + <li><code>clusterrolebindings</code></li> + <!-- eslint-enable @gitlab/vue-require-i18n-strings --> + </ul> + </div> + <strong v-html="confirmationTextLabel"></strong> + <form ref="form" :action="clusterPath" method="post" class="gl-mb-5"> + <input ref="method" type="hidden" name="_method" value="delete" /> + <input :value="csrfToken" type="hidden" name="authenticity_token" /> + <input ref="cleanup" type="hidden" name="cleanup" value="true" /> + <gl-form-input + v-model="enteredClusterName" + autofocus + type="text" + name="confirm_cluster_name_input" + autocomplete="off" + /> + </form> + <span v-if="confirmCleanup">{{ + s__( + 'ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration.', + ) + }}</span> <template #modal-footer> <gl-button variant="secondary" @click="handleCancel">{{ s__('Cancel') }}</gl-button> <template v-if="confirmCleanup"> |