Revert "Change eslint rules to use vue recommended"
Merged accidentally. Although this one did have the proper +1s/+2s.
The 2 underneath did not. The author will resubmit.
This reverts commit 5e7ac49058e5dc37fd43ecf3c0d06f5dda14af5b.
Change-Id: Iceb1de3a170cc0b592b183545c792aa3eb87bfee
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
index b016dcc..6ca43f3 100644
--- a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
+++ b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
@@ -1,13 +1,13 @@
<template>
<b-container class="ml-0">
- <page-title />
+ <PageTitle />
<b-row>
<b-col lg="10">
- <b-button variant="link" @click="initModalSettings">
+ <b-button @click="initModalSettings" variant="link">
Account policy settings
<icon-settings />
</b-button>
- <b-button variant="primary" @click="initModalUser(null)">
+ <b-button @click="initModalUser(null)" variant="primary">
Add user
<icon-add />
</b-button>
@@ -49,9 +49,9 @@
</b-col>
</b-row>
<!-- Modals -->
- <modal-settings :settings="settings"></modal-settings>
+ <modal-settings v-bind:settings="settings"></modal-settings>
<modal-user
- :user="activeUser"
+ v-bind:user="activeUser"
@ok="saveUser"
@hidden="clearActiveUser"
></modal-user>
@@ -70,7 +70,7 @@
import PageTitle from '../../../components/Global/PageTitle';
export default {
- name: 'LocalUsers',
+ name: 'local-users',
components: {
IconAdd,
IconEdit,
@@ -87,6 +87,9 @@
settings: null
};
},
+ created() {
+ this.getUsers();
+ },
computed: {
allUsers() {
return this.$store.getters['localUsers/allUsers'];
@@ -110,9 +113,6 @@
});
}
},
- created() {
- this.getUsers();
- },
methods: {
getUsers() {
this.$store.dispatch('localUsers/getUsers');
diff --git a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue
index a0d6294..dae4d90 100644
--- a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue
+++ b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue
@@ -4,11 +4,6 @@
<script>
export default {
- props: {
- settings: {
- type: String,
- default: ''
- }
- }
+ props: ['settings']
};
</script>
diff --git a/src/views/AccessControl/LocalUserManagement/ModalUser.vue b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
index d84fb6d..73aa164 100644
--- a/src/views/AccessControl/LocalUserManagement/ModalUser.vue
+++ b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
@@ -22,7 +22,7 @@
>
</b-form-group>
<b-form-group label="Username">
- <b-form-input v-model="form.username" type="text" />
+ <b-form-input type="text" v-model="form.username" />
</b-form-group>
<b-form-group label="Privilege">
<b-form-select
@@ -31,7 +31,7 @@
></b-form-select>
</b-form-group>
<b-form-group label="Password">
- <b-form-input v-model="form.password" type="password" />
+ <b-form-input type="password" v-model="form.password" />
</b-form-group>
</b-form>
<template v-slot:modal-ok>
@@ -47,12 +47,7 @@
<script>
export default {
- props: {
- user: {
- type: Object,
- default: null
- }
- },
+ props: ['user'],
data() {
return {
privilegeTypes: ['Administrator', 'Operator', 'ReadOnly', 'NoAccess']
diff --git a/src/views/AccessControl/LocalUserManagement/TableRoles.vue b/src/views/AccessControl/LocalUserManagement/TableRoles.vue
index ad313be..b401966 100644
--- a/src/views/AccessControl/LocalUserManagement/TableRoles.vue
+++ b/src/views/AccessControl/LocalUserManagement/TableRoles.vue
@@ -2,22 +2,22 @@
<b-table bordered small head-variant="dark" :items="items" :fields="fields">
<template v-slot:cell(administrator)="data">
<template v-if="data.value">
- <checkmark20 />
+ <Checkmark20 />
</template>
</template>
<template v-slot:cell(operator)="data">
<template v-if="data.value">
- <checkmark20 />
+ <Checkmark20 />
</template>
</template>
<template v-slot:cell(readonly)="data">
<template v-if="data.value">
- <checkmark20 />
+ <Checkmark20 />
</template>
</template>
<template v-slot:cell(noaccess)="data">
<template v-if="data.value">
- <checkmark20 />
+ <Checkmark20 />
</template>
</template>
</b-table>