summaryrefslogtreecommitdiff
path: root/src/views
diff options
context:
space:
mode:
authorDerick Montague <derick.montague@ibm.com>2020-01-24 00:45:57 +0300
committerDerick Montague <derick.montague@ibm.com>2020-01-31 02:06:25 +0300
commit09e45cd4f5e233d4ec75c086dd7ab912a2f79a41 (patch)
tree825a8c58830b45d5d6dc7d879f16efee575f5ce9 /src/views
parent4b0fc1dbb3f60a485d3ba7ec27d7654a8ea0d382 (diff)
downloadwebui-vue-09e45cd4f5e233d4ec75c086dd7ab912a2f79a41.tar.xz
Change eslint rules to use vue recommended
Resubmitting after reverted–original commit here https://gerrit.openbmc-project.xyz/c/openbmc/webui-vue/+/28763/7 - Ran npm run lint - Resolved eslint issues Signed-off-by: Derick Montague <derick.montague@ibm.com> Change-Id: I2b8b9244acddd483d0a72f9a5d156a79de9869a0
Diffstat (limited to 'src/views')
-rw-r--r--src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue12
-rw-r--r--src/views/AccessControl/LocalUserManagement/ModalSettings.vue7
-rw-r--r--src/views/AccessControl/LocalUserManagement/ModalUser.vue13
-rw-r--r--src/views/AccessControl/LocalUserManagement/TableRoles.vue8
-rw-r--r--src/views/Login/Login.vue12
-rw-r--r--src/views/Overview/Overview.vue30
-rw-r--r--src/views/Overview/OverviewEvents.vue10
-rw-r--r--src/views/Overview/OverviewQuickLinks.vue20
-rw-r--r--src/views/Unauthorized/Unauthorized.vue2
9 files changed, 62 insertions, 52 deletions
diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
index b81dba67..0ca3428d 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">
- <PageTitle />
+ <page-title />
<b-row>
<b-col lg="10" class="text-right">
<b-button variant="link" @click="initModalSettings">
Account policy settings
<icon-settings />
</b-button>
- <b-button @click="initModalUser(null)" variant="primary">
+ <b-button variant="primary" @click="initModalUser(null)">
Add user
<icon-add />
</b-button>
@@ -69,7 +69,7 @@ import ModalSettings from './ModalSettings';
import PageTitle from '../../../components/Global/PageTitle';
export default {
- name: 'local-users',
+ name: 'LocalUsers',
components: {
IconAdd,
IconChevron,
@@ -97,9 +97,6 @@ export default {
]
};
},
- created() {
- this.getUsers();
- },
computed: {
allUsers() {
return this.$store.getters['localUsers/allUsers'];
@@ -124,6 +121,9 @@ export default {
});
}
},
+ 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 dae4d908..a0d62941 100644
--- a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue
+++ b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue
@@ -4,6 +4,11 @@
<script>
export default {
- props: ['settings']
+ props: {
+ settings: {
+ type: String,
+ default: ''
+ }
+ }
};
</script>
diff --git a/src/views/AccessControl/LocalUserManagement/ModalUser.vue b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
index e3ceb7df..d156c3da 100644
--- a/src/views/AccessControl/LocalUserManagement/ModalUser.vue
+++ b/src/views/AccessControl/LocalUserManagement/ModalUser.vue
@@ -37,9 +37,9 @@
No special characters except underscore
</b-form-text>
<b-form-input
+ id="username"
v-model="form.username"
type="text"
- id="username"
aria-describedby="username-help-block"
:state="getValidationState($v.form.username)"
:disabled="!newUser && originalUsername === 'root'"
@@ -78,9 +78,9 @@
Password must between 8 – 20 characters
</b-form-text>
<b-form-input
+ id="password"
v-model="form.password"
type="password"
- id="password"
aria-describedby="password-help-block"
:state="getValidationState($v.form.password)"
@input="$v.form.password.$touch()"
@@ -103,9 +103,9 @@
label-for="password-confirmation"
>
<b-form-input
+ id="password-confirmation"
v-model="form.passwordConfirmation"
type="password"
- id="password-confirmation"
:state="getValidationState($v.form.passwordConfirmation)"
@input="$v.form.passwordConfirmation.$touch()"
/>
@@ -147,8 +147,13 @@ import {
import VuelidateMixin from '../../../components/Mixins/VuelidateMixin.js';
export default {
- props: ['user'],
mixins: [VuelidateMixin],
+ props: {
+ user: {
+ type: Object,
+ default: null
+ }
+ },
data() {
return {
privilegeTypes: ['Administrator', 'Operator', 'ReadOnly', 'NoAccess'],
diff --git a/src/views/AccessControl/LocalUserManagement/TableRoles.vue b/src/views/AccessControl/LocalUserManagement/TableRoles.vue
index 7ea89da9..0927c55d 100644
--- a/src/views/AccessControl/LocalUserManagement/TableRoles.vue
+++ b/src/views/AccessControl/LocalUserManagement/TableRoles.vue
@@ -2,22 +2,22 @@
<b-table small :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>
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 4270b3fd..35af76f2 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -15,7 +15,7 @@
</b-col>
<b-col md="6">
- <b-form class="login-form" @submit.prevent="login" novalidate>
+ <b-form class="login-form" novalidate @submit.prevent="login">
<b-alert class="login-error" :show="authError" variant="danger">
<p id="login-error-alert">
<strong>{{ errorMsg.title }}</strong>
@@ -81,11 +81,6 @@ import VuelidateMixin from '../../components/Mixins/VuelidateMixin.js';
export default {
name: 'Login',
mixins: [VuelidateMixin],
- computed: {
- authError() {
- return this.$store.getters['authentication/authError'];
- }
- },
data() {
return {
errorMsg: {
@@ -99,6 +94,11 @@ export default {
disableSubmitButton: false
};
},
+ computed: {
+ authError() {
+ return this.$store.getters['authentication/authError'];
+ }
+ },
validations: {
userInfo: {
username: {
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 2672af7e..6ff9f4a2 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -1,9 +1,9 @@
<template>
<b-container fluid>
- <PageTitle />
+ <page-title />
<b-row>
<b-col lg="8" sm="12">
- <PageSection sectionTitle="Server information">
+ <page-section section-title="Server information">
<b-row>
<b-col sm="6">
<dl>
@@ -30,8 +30,8 @@
</dl>
</b-col>
</b-row>
- </PageSection>
- <PageSection sectionTitle="BMC information">
+ </page-section>
+ <page-section section-title="BMC information">
<b-row>
<b-col sm="6">
<dl>
@@ -48,7 +48,7 @@
<b-col sm="6">
<dl>
<dt>IP address</dt>
- <dd v-for="ip in ipAddress" v-bind:key="ip.id">{{ ip }}</dd>
+ <dd v-for="ip in ipAddress" :key="ip.id">{{ ip }}</dd>
</dl>
</b-col>
<b-col sm="6">
@@ -58,8 +58,8 @@
</dl>
</b-col>
</b-row>
- </PageSection>
- <PageSection sectionTitle="Power consumption">
+ </page-section>
+ <page-section section-title="Power consumption">
<b-row>
<b-col sm="6">
<dl>
@@ -74,15 +74,15 @@
</dl>
</b-col>
</b-row>
- </PageSection>
+ </page-section>
</b-col>
<b-col lg="4" sm="12">
- <OverviewQuickLinks />
+ <overview-quick-links />
</b-col>
</b-row>
- <PageSection sectionTitle="High priority events">
- <OverviewEvents />
- </PageSection>
+ <page-section section-title="High priority events">
+ <overview-events />
+ </page-section>
</b-container>
</template>
@@ -100,9 +100,6 @@ export default {
PageTitle,
PageSection
},
- created() {
- this.getOverviewInfo();
- },
computed: mapState({
serverModel: state => state.overview.serverModel,
serverManufacturer: state => state.overview.serverManufacturer,
@@ -115,6 +112,9 @@ export default {
ipAddress: state => state.networkSettings.ipAddress,
macAddress: state => state.networkSettings.macAddress
}),
+ created() {
+ this.getOverviewInfo();
+ },
methods: {
getOverviewInfo() {
this.$store.dispatch('overview/getServerInfo');
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index 07aab1d5..5820e612 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -8,7 +8,7 @@
<small>{{
logData.Timestamp | date('MMM DD YYYY HH:MM:SS A ZZ')
}}</small>
- <ChevronRight16 />
+ <chevron-right16 />
</div>
<p class="mb-1">{{ logData.eventID }}: {{ logData.description }}</p>
</b-list-group-item>
@@ -22,18 +22,18 @@
<script>
import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
export default {
- name: 'events',
+ name: 'Events',
components: {
ChevronRight16
},
- created() {
- this.getEventLogData();
- },
computed: {
eventLogData() {
return this.$store.getters['eventLog/eventLogData'];
}
},
+ created() {
+ this.getEventLogData();
+ },
methods: {
getEventLogData() {
this.$store.dispatch('eventLog/getEventLogData');
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 726eaf7d..d9d86ca8 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -21,7 +21,7 @@
>
<!-- TODO: link to SOL -->
<span>Serial over LAN console</span>
- <ChevronRight16 />
+ <chevron-right16 />
</b-list-group-item>
<b-list-group-item
href="#"
@@ -29,7 +29,7 @@
>
<!-- TODO: link to network settings -->
<span>Edit network settings</span>
- <ChevronRight16 />
+ <chevron-right16 />
</b-list-group-item>
</b-list-group>
</template>
@@ -37,27 +37,27 @@
<script>
import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
export default {
- name: 'quickLinks',
+ name: 'QuickLinks',
components: {
ChevronRight16
},
- created() {
- this.getBmcTime();
+ data() {
+ return {
+ serverLEDChecked: false
+ };
},
computed: {
bmcTime() {
return this.$store.getters['global/bmcTime'];
}
},
+ created() {
+ this.getBmcTime();
+ },
methods: {
getBmcTime() {
this.$store.dispatch('global/getBmcTime');
}
- },
- data() {
- return {
- serverLedChecked: false
- };
}
};
</script>
diff --git a/src/views/Unauthorized/Unauthorized.vue b/src/views/Unauthorized/Unauthorized.vue
index 446270d7..d4203598 100644
--- a/src/views/Unauthorized/Unauthorized.vue
+++ b/src/views/Unauthorized/Unauthorized.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <PageTitle :description="description" />
+ <page-title :description="description" />
</div>
</template>
<script>