Update linting packages to use latest
- 99% of changes were small syntax changes that were changed by the
lint command. There were a couple of small manual changes to meet the
property order patterns established as part of the vue:recommended
guidelines.
There are rules that were set from errors to warnings and new stories
are being opened to address those issues.
Testing:
- Successfully ran npm run serve
- Successfully ran npm run lint
- Verified functionality works as expected, e.g. success and failure use cases
- Resolved any JavaScript errors thrown to the console
Signed-off-by: Derick Montague <derick.montague@ibm.com>
Change-Id: Ie082f31c73ccbe8a60afa8f88a9ef6dbf33d9fd2
diff --git a/src/views/AccessControl/Ldap/Ldap.vue b/src/views/AccessControl/Ldap/Ldap.vue
index 40164a5..2717201 100644
--- a/src/views/AccessControl/Ldap/Ldap.vue
+++ b/src/views/AccessControl/Ldap/Ldap.vue
@@ -96,7 +96,7 @@
<b-row>
<b-col sm="6" xl="4">
<b-form-group label-for="server-uri">
- <template v-slot:label>
+ <template #label>
{{ $t('pageLdap.form.serverUri') }}
<info-tooltip
:title="$t('pageLdap.form.serverUriTooltip')"
@@ -174,7 +174,7 @@
</b-col>
<b-col sm="6" xl="4">
<b-form-group label-for="user-id-attribute">
- <template v-slot:label>
+ <template #label>
{{ $t('pageLdap.form.userIdAttribute') }} -
<span class="form-text d-inline">
{{ $t('global.form.optional') }}
@@ -190,7 +190,7 @@
</b-col>
<b-col sm="6" xl="4">
<b-form-group label-for="group-id-attribute">
- <template v-slot:label>
+ <template #label>
{{ $t('pageLdap.form.groupIdAttribute') }} -
<span class="form-text d-inline">
{{ $t('global.form.optional') }}
@@ -252,9 +252,13 @@
InputPasswordToggle,
PageTitle,
PageSection,
- TableRoleGroups
+ TableRoleGroups,
},
mixins: [BVToastMixin, VuelidateMixin, LoadingBarMixin],
+ beforeRouteLeave(to, from, next) {
+ this.hideLoader();
+ next();
+ },
data() {
return {
form: {
@@ -268,8 +272,8 @@
bindPassword: '',
baseDn: '',
userIdAttribute: '',
- groupIdAttribute: ''
- }
+ groupIdAttribute: '',
+ },
};
},
computed: {
@@ -277,70 +281,70 @@
'isServiceEnabled',
'isActiveDirectoryEnabled',
'ldap',
- 'activeDirectory'
+ 'activeDirectory',
]),
sslCertificates() {
return this.$store.getters['sslCertificates/allCertificates'];
},
caCertificateExpiration() {
const caCertificate = find(this.sslCertificates, {
- type: 'TrustStore Certificate'
+ type: 'TrustStore Certificate',
});
if (caCertificate === undefined) return null;
return caCertificate.validUntil;
},
ldapCertificateExpiration() {
const ldapCertificate = find(this.sslCertificates, {
- type: 'LDAP Certificate'
+ type: 'LDAP Certificate',
});
if (ldapCertificate === undefined) return null;
return ldapCertificate.validUntil;
},
ldapProtocol() {
return this.form.secureLdapEnabled ? 'ldaps://' : 'ldap://';
- }
+ },
},
watch: {
- isServiceEnabled: function(value) {
+ isServiceEnabled: function (value) {
this.form.ldapAuthenticationEnabled = value;
},
- isActiveDirectoryEnabled: function(value) {
+ isActiveDirectoryEnabled: function (value) {
this.form.activeDirectoryEnabled = value;
this.setFormValues();
- }
+ },
},
validations: {
form: {
ldapAuthenticationEnabled: {},
secureLdapEnabled: {},
activeDirectoryEnabled: {
- required: requiredIf(function() {
+ required: requiredIf(function () {
return this.form.ldapAuthenticationEnabled;
- })
+ }),
},
serverUri: {
- required: requiredIf(function() {
+ required: requiredIf(function () {
return this.form.ldapAuthenticationEnabled;
- })
+ }),
},
bindDn: {
- required: requiredIf(function() {
+ required: requiredIf(function () {
return this.form.ldapAuthenticationEnabled;
- })
+ }),
},
bindPassword: {
- required: requiredIf(function() {
+ required: requiredIf(function () {
return this.form.ldapAuthenticationEnabled;
- })
+ }),
},
baseDn: {
- required: requiredIf(function() {
+ required: requiredIf(function () {
return this.form.ldapAuthenticationEnabled;
- })
+ }),
},
userIdAttribute: {},
- groupIdAttribute: {}
- }
+ groupIdAttribute: {},
+ },
},
created() {
this.startLoader();
@@ -350,10 +354,6 @@
this.$store.dispatch('sslCertificates/getCertificates');
this.setFormValues();
},
- beforeRouteLeave(to, from, next) {
- this.hideLoader();
- next();
- },
methods: {
setFormValues(serviceType) {
if (!serviceType) {
@@ -366,7 +366,7 @@
bindDn = '',
baseDn = '',
userAttribute = '',
- groupsAttribute = ''
+ groupsAttribute = '',
} = serviceType;
const secureLdap =
serviceAddress && serviceAddress.includes('ldaps://') ? true : false;
@@ -392,12 +392,12 @@
bindPassword: this.form.bindPassword,
baseDn: this.form.baseDn,
userIdAttribute: this.form.userIdAttribute,
- groupIdAttribute: this.form.groupIdAttribute
+ groupIdAttribute: this.form.groupIdAttribute,
};
this.startLoader();
this.$store
.dispatch('ldap/saveAccountSettings', data)
- .then(success => {
+ .then((success) => {
this.successToast(success);
this.$v.form.$reset();
})
@@ -426,7 +426,7 @@
// disables the service.
this.setFormValues();
}
- }
- }
+ },
+ },
};
</script>